3
0

Merge pull request from dpalou/MOBILE-2839

Mobile 2839
This commit is contained in:
Juan Leyva 2019-01-28 18:39:59 +01:00 committed by GitHub
commit ba8fc49df5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 120 additions and 114 deletions

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="com.moodle.moodlemobile" version="3.6.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"> <widget id="com.moodle.moodlemobile" version="3.6.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">
<name>Moodle</name> <name>Moodle</name>
<description>Moodle official app</description> <description>Moodle official app</description>
<author email="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author> <author email="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author>
@ -94,33 +94,33 @@
<icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" /> <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" /> <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
</platform> </platform>
<plugin name="com-darryncampbell-cordova-plugin-intent" spec="1.1.1" /> <plugin name="com-darryncampbell-cordova-plugin-intent" spec="^1.1.1" />
<plugin name="cordova-android-support-gradle-release" spec="2.0.1"> <plugin name="cordova-android-support-gradle-release" spec="^2.0.1">
<variable name="ANDROID_SUPPORT_VERSION" value="27.1.0" /> <variable name="ANDROID_SUPPORT_VERSION" value="27.1.0" />
</plugin> </plugin>
<plugin name="cordova-clipboard" spec="1.2.1" /> <plugin name="cordova-clipboard" spec="^1.2.1" />
<plugin name="cordova-plugin-badge" spec="0.8.8" /> <plugin name="cordova-plugin-badge" spec="^0.8.8" />
<plugin name="cordova-plugin-camera" spec="4.0.3" /> <plugin name="cordova-plugin-camera" spec="^4.0.3" />
<plugin name="cordova-plugin-customurlscheme" spec="4.3.0"> <plugin name="cordova-plugin-customurlscheme" spec="^4.3.0">
<variable name="URL_SCHEME" value="moodlemobile" /> <variable name="URL_SCHEME" value="moodlemobile" />
</plugin> </plugin>
<plugin name="cordova-plugin-device" spec="2.0.2" /> <plugin name="cordova-plugin-device" spec="^2.0.2" />
<plugin name="cordova-plugin-file" spec="6.0.1" /> <plugin name="cordova-plugin-file" spec="^6.0.1" />
<plugin name="cordova-plugin-file-opener2" spec="2.0.19" /> <plugin name="cordova-plugin-file-opener2" spec="^2.0.19" />
<plugin name="cordova-plugin-file-transfer" spec="1.7.1" /> <plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
<plugin name="cordova-plugin-globalization" spec="1.11.0" /> <plugin name="cordova-plugin-globalization" spec="^1.11.0" />
<plugin name="cordova-plugin-inappbrowser" spec="3.0.0" /> <plugin name="cordova-plugin-inappbrowser" spec="^3.0.0" />
<plugin name="cordova-plugin-ionic-keyboard" spec="2.1.3" /> <plugin name="cordova-plugin-ionic-keyboard" spec="^2.1.3" />
<plugin name="cordova-plugin-local-notifications-mm" spec="1.0.13" /> <plugin name="cordova-plugin-local-notifications-mm" spec="^1.0.13" />
<plugin name="cordova-plugin-media-capture" spec="3.0.2" /> <plugin name="cordova-plugin-media-capture" spec="^3.0.2" />
<plugin name="cordova-plugin-network-information" spec="2.0.1" /> <plugin name="cordova-plugin-network-information" spec="^2.0.1" />
<plugin name="cordova-plugin-screen-orientation" spec="3.0.1" /> <plugin name="cordova-plugin-screen-orientation" spec="^3.0.1" />
<plugin name="cordova-plugin-splashscreen" spec="5.0.2" /> <plugin name="cordova-plugin-splashscreen" spec="^5.0.2" />
<plugin name="cordova-plugin-statusbar" spec="2.4.2" /> <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
<plugin name="cordova-plugin-whitelist" spec="1.3.3" /> <plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
<plugin name="cordova-plugin-zip" spec="3.1.0" /> <plugin name="cordova-plugin-zip" spec="^3.1.0" />
<plugin name="cordova-sqlite-storage" spec="2.6.0" /> <plugin name="cordova-sqlite-storage" spec="^2.6.0" />
<plugin name="nl.kingsquare.cordova.background-audio" spec="1.0.1" /> <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"> <plugin name="phonegap-plugin-push" spec="https://github.com/moodlemobile/phonegap-plugin-push.git#moodle">
<variable name="SENDER_ID" value="694767596569" /> <variable name="SENDER_ID" value="694767596569" />
</plugin> </plugin>

@ -1,4 +1,4 @@
// New copy task for font files // New copy task for font files and config.json.
module.exports = { module.exports = {
// Override Ionic copyFonts task to exclude Roboto and Noto fonts. // Override Ionic copyFonts task to exclude Roboto and Noto fonts.
copyFonts: { copyFonts: {
@ -8,5 +8,9 @@ module.exports = {
copyFontAwesome: { copyFontAwesome: {
src: ['{{ROOT}}/node_modules/font-awesome/fonts/**/*'], src: ['{{ROOT}}/node_modules/font-awesome/fonts/**/*'],
dest: '{{WWW}}/assets/fonts' dest: '{{WWW}}/assets/fonts'
},
copyConfig: {
src: ['{{ROOT}}/src/config.json'],
dest: '{{WWW}}/'
} }
}; };

@ -6,7 +6,7 @@
<Identity Name="3312ADB7.MoodleDesktop" <Identity Name="3312ADB7.MoodleDesktop"
ProcessorArchitecture="x64" ProcessorArchitecture="x64"
Publisher="CN=33CDCDF6-1EB5-4827-9897-ED25C91A32F6" Publisher="CN=33CDCDF6-1EB5-4827-9897-ED25C91A32F6"
Version="3.6.0.0" /> Version="3.6.1.0" />
<Properties> <Properties>
<DisplayName>Moodle Desktop</DisplayName> <DisplayName>Moodle Desktop</DisplayName>
<PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName> <PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>

2
package-lock.json generated

@ -1,6 +1,6 @@
{ {
"name": "moodlemobile", "name": "moodlemobile",
"version": "3.6.0", "version": "3.6.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

@ -1,6 +1,6 @@
{ {
"name": "moodlemobile", "name": "moodlemobile",
"version": "3.6.0", "version": "3.6.1",
"description": "The official app for Moodle.", "description": "The official app for Moodle.",
"author": { "author": {
"name": "Moodle Pty Ltd.", "name": "Moodle Pty Ltd.",
@ -39,99 +39,99 @@
"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" "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": { "dependencies": {
"@angular/animations": "5.2.10", "@angular/animations": "^5.2.10",
"@angular/common": "5.2.10", "@angular/common": "^5.2.10",
"@angular/compiler": "5.2.10", "@angular/compiler": "^5.2.10",
"@angular/compiler-cli": "5.2.10", "@angular/compiler-cli": "^5.2.10",
"@angular/core": "5.2.10", "@angular/core": "^5.2.10",
"@angular/forms": "5.2.10", "@angular/forms": "^5.2.10",
"@angular/http": "5.2.10", "@angular/http": "^5.2.10",
"@angular/platform-browser": "5.2.10", "@angular/platform-browser": "^5.2.10",
"@angular/platform-browser-dynamic": "5.2.10", "@angular/platform-browser-dynamic": "^5.2.10",
"@ionic-native/badge": "4.17.0", "@ionic-native/badge": "^4.17.0",
"@ionic-native/camera": "4.17.0", "@ionic-native/camera": "^4.17.0",
"@ionic-native/clipboard": "4.17.0", "@ionic-native/clipboard": "^4.17.0",
"@ionic-native/core": "4.11.0", "@ionic-native/core": "^4.11.0",
"@ionic-native/device": "4.17.0", "@ionic-native/device": "^4.17.0",
"@ionic-native/file": "4.17.0", "@ionic-native/file": "^4.17.0",
"@ionic-native/file-opener": "4.17.0", "@ionic-native/file-opener": "^4.17.0",
"@ionic-native/file-transfer": "4.17.0", "@ionic-native/file-transfer": "^4.17.0",
"@ionic-native/globalization": "4.17.0", "@ionic-native/globalization": "^4.17.0",
"@ionic-native/in-app-browser": "4.17.0", "@ionic-native/in-app-browser": "^4.17.0",
"@ionic-native/keyboard": "4.17.0", "@ionic-native/keyboard": "^4.17.0",
"@ionic-native/local-notifications": "4.5.2", "@ionic-native/local-notifications": "4.5.2",
"@ionic-native/media-capture": "4.17.0", "@ionic-native/media-capture": "^4.17.0",
"@ionic-native/network": "4.17.0", "@ionic-native/network": "^4.17.0",
"@ionic-native/push": "4.17.0", "@ionic-native/push": "^4.17.0",
"@ionic-native/screen-orientation": "4.17.0", "@ionic-native/screen-orientation": "^4.17.0",
"@ionic-native/splash-screen": "4.17.0", "@ionic-native/splash-screen": "^4.17.0",
"@ionic-native/sqlite": "4.17.0", "@ionic-native/sqlite": "^4.17.0",
"@ionic-native/status-bar": "4.17.0", "@ionic-native/status-bar": "^4.17.0",
"@ionic-native/web-intent": "4.17.0", "@ionic-native/web-intent": "^4.17.0",
"@ionic-native/zip": "4.17.0", "@ionic-native/zip": "^4.17.0",
"@ngx-translate/core": "8.0.0", "@ngx-translate/core": "^8.0.0",
"@ngx-translate/http-loader": "2.0.1", "@ngx-translate/http-loader": "^2.0.1",
"@types/cordova": "0.0.34", "@types/cordova": "^0.0.34",
"@types/cordova-plugin-file-transfer": "0.0.3", "@types/cordova-plugin-file-transfer": "^0.0.3",
"@types/cordova-plugin-globalization": "0.0.3", "@types/cordova-plugin-globalization": "^0.0.3",
"@types/cordova-plugin-network-information": "0.0.3", "@types/cordova-plugin-network-information": "^0.0.3",
"@types/node": "8.10.19", "@types/node": "^8.10.19",
"@types/promise.prototype.finally": "2.0.2", "@types/promise.prototype.finally": "^2.0.2",
"chart.js": "2.7.2", "chart.js": "^2.7.2",
"com-darryncampbell-cordova-plugin-intent": "1.1.1", "com-darryncampbell-cordova-plugin-intent": "^1.1.1",
"cordova-android": "7.1.2", "cordova-android": "7.1.2",
"cordova-android-support-gradle-release": "2.0.1", "cordova-android-support-gradle-release": "^2.0.1",
"cordova-clipboard": "1.2.1", "cordova-clipboard": "^1.2.1",
"cordova-ios": "4.5.5", "cordova-ios": "4.5.5",
"cordova-plugin-app-event": "1.2.1", "cordova-plugin-app-event": "1.2.1",
"cordova-plugin-badge": "0.8.8", "cordova-plugin-badge": "^0.8.8",
"cordova-plugin-camera": "4.0.3", "cordova-plugin-camera": "^4.0.3",
"cordova-plugin-customurlscheme": "4.3.0", "cordova-plugin-customurlscheme": "^4.3.0",
"cordova-plugin-device": "2.0.2", "cordova-plugin-device": "^2.0.2",
"cordova-plugin-file": "6.0.1", "cordova-plugin-file": "^6.0.1",
"cordova-plugin-file-opener2": "2.0.19", "cordova-plugin-file-opener2": "^2.0.19",
"cordova-plugin-file-transfer": "1.7.1", "cordova-plugin-file-transfer": "^1.7.1",
"cordova-plugin-globalization": "1.11.0", "cordova-plugin-globalization": "^1.11.0",
"cordova-plugin-inappbrowser": "3.0.0", "cordova-plugin-inappbrowser": "^3.0.0",
"cordova-plugin-ionic-keyboard": "2.1.3", "cordova-plugin-ionic-keyboard": "^2.1.3",
"cordova-plugin-local-notifications-mm": "1.0.13", "cordova-plugin-local-notifications-mm": "^1.0.13",
"cordova-plugin-media-capture": "3.0.2", "cordova-plugin-media-capture": "^3.0.2",
"cordova-plugin-network-information": "2.0.1", "cordova-plugin-network-information": "^2.0.1",
"cordova-plugin-screen-orientation": "3.0.1", "cordova-plugin-screen-orientation": "^3.0.1",
"cordova-plugin-splashscreen": "5.0.2", "cordova-plugin-splashscreen": "^5.0.2",
"cordova-plugin-statusbar": "2.4.2", "cordova-plugin-statusbar": "^2.4.2",
"cordova-plugin-whitelist": "1.3.3", "cordova-plugin-whitelist": "^1.3.3",
"cordova-plugin-zip": "3.1.0", "cordova-plugin-zip": "^3.1.0",
"cordova-sqlite-storage": "2.6.0", "cordova-sqlite-storage": "^2.6.0",
"es6-promise-plugin": "4.2.2", "es6-promise-plugin": "^4.2.2",
"font-awesome": "4.7.0", "font-awesome": "^4.7.0",
"ionic-angular": "3.9.2", "ionic-angular": "3.9.2",
"ionicons": "3.0.0", "ionicons": "^3.0.0",
"jszip": "3.1.5", "jszip": "^3.1.5",
"moment": "2.22.2", "moment": "^2.22.2",
"nl.kingsquare.cordova.background-audio": "1.0.1", "nl.kingsquare.cordova.background-audio": "^1.0.1",
"phonegap-plugin-push": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle", "phonegap-plugin-push": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle",
"promise.prototype.finally": "3.1.0", "promise.prototype.finally": "^3.1.0",
"rxjs": "5.5.11", "rxjs": "^5.5.11",
"sw-toolbox": "3.6.0", "sw-toolbox": "^3.6.0",
"ts-md5": "1.2.4", "ts-md5": "^1.2.4",
"web-animations-js": "2.3.1", "web-animations-js": "^2.3.1",
"zone.js": "0.8.26" "zone.js": "^0.8.26"
}, },
"devDependencies": { "devDependencies": {
"@ionic/app-scripts": "3.1.9", "@ionic/app-scripts": "3.1.9",
"electron-rebuild": "1.8.1", "electron-rebuild": "^1.8.1",
"electron-builder-lib": "20.23.1", "electron-builder-lib": "^20.23.1",
"gulp": "4.0.0", "gulp": "^4.0.0",
"gulp-clip-empty-files": "0.1.2", "gulp-clip-empty-files": "^0.1.2",
"gulp-flatten": "0.4.0", "gulp-flatten": "^0.4.0",
"gulp-rename": "1.3.0", "gulp-rename": "^1.3.0",
"gulp-slash": "1.1.3", "gulp-slash": "^1.1.3",
"gulp-util": "3.0.8", "gulp-util": "^3.0.8",
"node-loader": "0.6.0", "node-loader": "^0.6.0",
"through": "2.3.8", "through": "^2.3.8",
"typescript": "2.6.2", "typescript": "^2.6.2",
"webpack-merge": "4.1.2" "webpack-merge": "^4.1.2"
}, },
"browser": { "browser": {
"electron": false "electron": false

@ -2,8 +2,8 @@
"app_id": "com.moodle.moodlemobile", "app_id": "com.moodle.moodlemobile",
"appname": "Moodle Mobile", "appname": "Moodle Mobile",
"desktopappname": "Moodle Desktop", "desktopappname": "Moodle Desktop",
"versioncode": 3600, "versioncode": 3610,
"versionname": "3.6.0", "versionname": "3.6.1-dev",
"cache_expiration_time": 300000, "cache_expiration_time": 300000,
"default_lang": "en", "default_lang": "en",
"languages": { "languages": {

@ -1 +1,3 @@
This folder only contains compiled code and assets. Please do not modify files in this folder, the app code is in the "src" folder. This folder only contains compiled code and assets. Please do not modify files in this folder, the app code is in the "src" folder.
The config.json values are ignored by the app. This file is informative for Continous Integration processes used by Moodle HQ.