diff --git a/config.xml b/config.xml
index c3f6a820d..a8ee57ec4 100644
--- a/config.xml
+++ b/config.xml
@@ -112,33 +112,33 @@
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/package.json b/package.json
index 2fa23a48a..221a31a47 100644
--- a/package.json
+++ b/package.json
@@ -39,100 +39,100 @@
"windows.store": "electron-windows-store --input-directory .\\desktop\\dist\\win-unpacked --output-directory .\\desktop\\store --flatten true -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.1",
+ "@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.1",
"cordova-android": "7.1.2",
- "cordova-android-support-gradle-release": "^2.0.1",
- "cordova-clipboard": "^1.2.1",
+ "cordova-android-support-gradle-release": "2.0.1",
+ "cordova-clipboard": "1.2.1",
"cordova-ios": "4.5.5",
- "cordova-plugin-badge": "^0.8.8",
- "cordova-plugin-camera": "^4.0.3",
- "cordova-plugin-customurlscheme": "^4.3.0",
- "cordova-plugin-device": "^2.0.2",
- "cordova-plugin-file": "^6.0.1",
- "cordova-plugin-file-opener2": "^2.0.19",
- "cordova-plugin-file-transfer": "^1.7.1",
- "cordova-plugin-globalization": "^1.11.0",
- "cordova-plugin-inappbrowser": "^3.0.0",
- "cordova-plugin-ionic-keyboard": "^2.1.3",
- "cordova-plugin-local-notification": "^0.9.0-beta.3",
- "cordova-plugin-media-capture": "^3.0.2",
- "cordova-plugin-network-information": "^2.0.1",
- "cordova-plugin-screen-orientation": "^3.0.1",
- "cordova-plugin-splashscreen": "^5.0.2",
- "cordova-plugin-statusbar": "^2.4.2",
- "cordova-plugin-whitelist": "^1.3.3",
- "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-badge": "0.8.8",
+ "cordova-plugin-camera": "4.0.3",
+ "cordova-plugin-customurlscheme": "4.3.0",
+ "cordova-plugin-device": "2.0.2",
+ "cordova-plugin-file": "6.0.1",
+ "cordova-plugin-file-opener2": "2.0.19",
+ "cordova-plugin-file-transfer": "1.7.1",
+ "cordova-plugin-globalization": "1.11.0",
+ "cordova-plugin-inappbrowser": "3.0.0",
+ "cordova-plugin-ionic-keyboard": "2.1.3",
+ "cordova-plugin-local-notification": "0.9.0-beta.3",
+ "cordova-plugin-media-capture": "3.0.2",
+ "cordova-plugin-network-information": "2.0.1",
+ "cordova-plugin-screen-orientation": "3.0.1",
+ "cordova-plugin-splashscreen": "5.0.2",
+ "cordova-plugin-statusbar": "2.4.2",
+ "cordova-plugin-whitelist": "1.3.3",
+ "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-v2",
- "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",
- "gulp": "^4.0.0",
- "gulp-clip-empty-files": "^0.1.2",
- "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"
+ "@ionic/app-scripts": "3.2.2",
+ "electron-builder-lib": "20.23.1",
+ "electron-rebuild": "1.8.1",
+ "gulp": "4.0.0",
+ "gulp-clip-empty-files": "0.1.2",
+ "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
diff --git a/src/addon/messages/lang/en.json b/src/addon/messages/lang/en.json
index 75419bf5b..1b542a0c7 100644
--- a/src/addon/messages/lang/en.json
+++ b/src/addon/messages/lang/en.json
@@ -74,6 +74,6 @@
"warningmessagenotsent": "Couldn't send message(s) to user {{user}}. {{error}}",
"wouldliketocontactyou": "Would like to contact you",
"you": "You:",
- "youhaveblockeduser": "You have blocked this user in the past",
+ "youhaveblockeduser": "You have blocked this user.",
"yourcontactrequestpending": "Your contact request is pending with {{$a}}"
}
\ No newline at end of file
diff --git a/src/addon/mod/choice/lang/en.json b/src/addon/mod/choice/lang/en.json
index a0714b34a..e5c48508f 100644
--- a/src/addon/mod/choice/lang/en.json
+++ b/src/addon/mod/choice/lang/en.json
@@ -2,11 +2,11 @@
"cannotsubmit": "Sorry, there was a problem submitting your choice. Please try again.",
"choiceoptions": "Choice options",
"errorgetchoice": "Error getting choice data.",
- "expired": "Sorry, this activity closed on {{$a}} and is no longer available",
+ "expired": "This activity closed on {{$a}}.",
"full": "(Full)",
"modulenameplural": "Choices",
"noresultsviewable": "The results are not currently viewable.",
- "notopenyet": "Sorry, this activity is not available until {{$a}}",
+ "notopenyet": "This activity is not available until {{$a}}.",
"numberofuser": "Number of responses",
"numberofuserinpercentage": "Percentage of responses",
"previewonly": "This is just a preview of the available options for this activity. You will not be able to submit your choice until {{$a}}.",
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 59cf7b125..68ddb31fb 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -234,7 +234,7 @@
"addon.messages.warningmessagenotsent": "Couldn't send message(s) to user {{user}}. {{error}}",
"addon.messages.wouldliketocontactyou": "Would like to contact you",
"addon.messages.you": "You:",
- "addon.messages.youhaveblockeduser": "You have blocked this user in the past",
+ "addon.messages.youhaveblockeduser": "You have blocked this user.",
"addon.messages.yourcontactrequestpending": "Your contact request is pending with {{$a}}",
"addon.mod_assign.acceptsubmissionstatement": "Please accept the submission statement.",
"addon.mod_assign.addattempt": "Allow another attempt",
@@ -372,11 +372,11 @@
"addon.mod_choice.cannotsubmit": "Sorry, there was a problem submitting your choice. Please try again.",
"addon.mod_choice.choiceoptions": "Choice options",
"addon.mod_choice.errorgetchoice": "Error getting choice data.",
- "addon.mod_choice.expired": "Sorry, this activity closed on {{$a}} and is no longer available",
+ "addon.mod_choice.expired": "This activity closed on {{$a}}.",
"addon.mod_choice.full": "(Full)",
"addon.mod_choice.modulenameplural": "Choices",
"addon.mod_choice.noresultsviewable": "The results are not currently viewable.",
- "addon.mod_choice.notopenyet": "Sorry, this activity is not available until {{$a}}",
+ "addon.mod_choice.notopenyet": "This activity is not available until {{$a}}.",
"addon.mod_choice.numberofuser": "Number of responses",
"addon.mod_choice.numberofuserinpercentage": "Percentage of responses",
"addon.mod_choice.previewonly": "This is just a preview of the available options for this activity. You will not be able to submit your choice until {{$a}}.",