EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2489 from dpalou/MOBILE-3499 

Mobile 3499
main
Juan Leyva 2020-08-26 11:31:38 +02:00 committed by GitHub
parent e445524ceb b0ec4f871b
commit 5fa2678fb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 547 additions and 1039 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -71,7 +71,7 @@ jobs:
name: "Build iOS" name: "Build iOS"
if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND NOT branch = desktop) OR (env(DEPLOY) IN (2,3) AND tag IS NOT blank)) if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND NOT branch = desktop) OR (env(DEPLOY) IN (2,3) AND tag IS NOT blank))
os: osx os: osx
osx_image: xcode11.3 osx_image: xcode12u
env: env:
- BUILD_PLATFORM='ios' - BUILD_PLATFORM='ios'
script: scripts/aot.sh script: scripts/aot.sh
@ -88,7 +88,7 @@ jobs:
name: "Build MacOS" name: "Build MacOS"
if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND branch = desktop) OR (env(DEPLOY) = 3 AND tag IS NOT blank)) if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND branch = desktop) OR (env(DEPLOY) = 3 AND tag IS NOT blank))
os: osx os: osx
osx_image: xcode11.3 osx_image: xcode12u
env: env:
- ELECTRON_CACHE=$HOME/.cache/electron - ELECTRON_CACHE=$HOME/.cache/electron
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder

4
config.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget android-versionCode="39200" id="com.moodle.moodlemobile" ios-CFBundleVersion="3.9.2.0" version="3.9.2" versionCode="39200" 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 android-versionCode="39300" id="com.moodle.moodlemobile" ios-CFBundleVersion="3.9.3.0" version="3.9.3-dev" versionCode="39300" 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>
@ -241,7 +241,7 @@
<true /> <true />
</edit-config> </edit-config>
<edit-config file="*-Info.plist" mode="merge" target="CFBundleShortVersionString"> <edit-config file="*-Info.plist" mode="merge" target="CFBundleShortVersionString">
<string>3.9.2</string> <string>3.9.3-dev</string>
</edit-config> </edit-config>
<config-file parent="FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED" target="*-Info.plist"> <config-file parent="FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED" target="*-Info.plist">
<string>YES</string> <string>YES</string>

2
desktop/assets/windows/AppXManifest.xml
View File

@ -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.9.2.0" /> Version="3.9.3.0" />
<Properties> <Properties>
<DisplayName>Moodle Desktop</DisplayName> <DisplayName>Moodle Desktop</DisplayName>
<PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName> <PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>

1386
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

186
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "moodlemobile", "name": "moodlemobile",
"version": "3.9.2", "version": "3.9.3",
"description": "The official app for Moodle.", "description": "The official app for Moodle.",
"author": { "author": {
"name": "Moodle Pty Ltd.", "name": "Moodle Pty Ltd.",
@ -47,120 +47,120 @@
"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" "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": { "dependencies": {
"@angular/animations": "5.2.11", "@angular/animations": "^5.2.11",
"@angular/common": "5.2.11", "@angular/common": "^5.2.11",
"@angular/compiler": "5.2.11", "@angular/compiler": "^5.2.11",
"@angular/compiler-cli": "5.2.11", "@angular/compiler-cli": "^5.2.11",
"@angular/core": "5.2.11", "@angular/core": "^5.2.11",
"@angular/forms": "5.2.11", "@angular/forms": "^5.2.11",
"@angular/platform-browser": "5.2.11", "@angular/platform-browser": "^5.2.11",
"@angular/platform-browser-dynamic": "5.2.11", "@angular/platform-browser-dynamic": "^5.2.11",
"@ionic-native/badge": "4.20.0", "@ionic-native/badge": "^4.20.0",
"@ionic-native/camera": "4.20.0", "@ionic-native/camera": "^4.20.0",
"@ionic-native/chooser": "^4.20.0", "@ionic-native/chooser": "^4.20.0",
"@ionic-native/clipboard": "4.20.0", "@ionic-native/clipboard": "^4.20.0",
"@ionic-native/core": "4.20.0", "@ionic-native/core": "^4.20.0",
"@ionic-native/device": "4.20.0", "@ionic-native/device": "^4.20.0",
"@ionic-native/file": "4.20.0", "@ionic-native/file": "^4.20.0",
"@ionic-native/file-opener": "4.20.0", "@ionic-native/file-opener": "^4.20.0",
"@ionic-native/file-transfer": "4.20.0", "@ionic-native/file-transfer": "^4.20.0",
"@ionic-native/geolocation": "4.20.0", "@ionic-native/geolocation": "^4.20.0",
"@ionic-native/globalization": "4.20.0", "@ionic-native/globalization": "^4.20.0",
"@ionic-native/http": "^4.20.0", "@ionic-native/http": "^4.20.0",
"@ionic-native/in-app-browser": "4.20.0", "@ionic-native/in-app-browser": "^4.20.0",
"@ionic-native/keyboard": "4.20.0", "@ionic-native/keyboard": "^4.20.0",
"@ionic-native/local-notifications": "4.20.0", "@ionic-native/local-notifications": "^4.20.0",
"@ionic-native/media-capture": "4.20.0", "@ionic-native/media-capture": "^4.20.0",
"@ionic-native/network": "4.20.0", "@ionic-native/network": "^4.20.0",
"@ionic-native/push": "4.20.0", "@ionic-native/push": "^4.20.0",
"@ionic-native/qr-scanner": "4.20.0", "@ionic-native/qr-scanner": "^4.20.0",
"@ionic-native/screen-orientation": "4.20.0", "@ionic-native/screen-orientation": "^4.20.0",
"@ionic-native/splash-screen": "4.20.0", "@ionic-native/splash-screen": "^4.20.0",
"@ionic-native/sqlite": "4.20.0", "@ionic-native/sqlite": "^4.20.0",
"@ionic-native/status-bar": "4.20.0", "@ionic-native/status-bar": "^4.20.0",
"@ionic-native/web-intent": "4.20.0", "@ionic-native/web-intent": "^4.20.0",
"@ionic-native/zip": "4.20.0", "@ionic-native/zip": "^4.20.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",
"ajv": "6.11.0", "ajv": "^6.11.0",
"chart.js": "2.9.3", "chart.js": "^2.9.3",
"com-darryncampbell-cordova-plugin-intent": "1.3.0", "com-darryncampbell-cordova-plugin-intent": "^1.3.0",
"cordova": "9.0.0", "cordova": "9.0.0",
"cordova-android": "8.1.0", "cordova-android": "^8.1.0",
"cordova-android-support-gradle-release": "3.0.1", "cordova-android-support-gradle-release": "^3.0.1",
"cordova-clipboard": "1.3.0", "cordova-clipboard": "^1.3.0",
"cordova-ios": "5.1.1", "cordova-ios": "^5.1.1",
"cordova-plugin-advanced-http": "2.4.1", "cordova-plugin-advanced-http": "^2.4.1",
"cordova-plugin-badge": "0.8.8", "cordova-plugin-badge": "^0.8.8",
"cordova-plugin-camera": "4.1.0", "cordova-plugin-camera": "^4.1.0",
"cordova-plugin-chooser": "1.3.1", "cordova-plugin-chooser": "^1.3.2",
"cordova-plugin-customurlscheme": "5.0.0", "cordova-plugin-customurlscheme": "^5.0.1",
"cordova-plugin-device": "2.0.3", "cordova-plugin-device": "^2.0.3",
"cordova-plugin-file": "6.0.2", "cordova-plugin-file": "^6.0.2",
"cordova-plugin-file-opener2": "3.0.0", "cordova-plugin-file-opener2": "^3.0.4",
"cordova-plugin-file-transfer": "1.7.1", "cordova-plugin-file-transfer": "^1.7.1",
"cordova-plugin-geolocation": "git+https://github.com/apache/cordova-plugin-geolocation.git#89cf51d222e8f225bdfb661965b3007d669c40ff", "cordova-plugin-geolocation": "git+https://github.com/apache/cordova-plugin-geolocation.git#89cf51d222e8f225bdfb661965b3007d669c40ff",
"cordova-plugin-globalization": "1.11.0", "cordova-plugin-globalization": "^1.11.0",
"cordova-plugin-inappbrowser": "4.0.0", "cordova-plugin-inappbrowser": "^4.0.0",
"cordova-plugin-ionic-keyboard": "2.1.3", "cordova-plugin-ionic-keyboard": "2.1.3",
"cordova-plugin-ionic-webview": "git+https://github.com/moodlemobile/cordova-plugin-ionic-webview.git#500-moodle", "cordova-plugin-ionic-webview": "git+https://github.com/moodlemobile/cordova-plugin-ionic-webview.git#500-moodle",
"cordova-plugin-local-notification": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle", "cordova-plugin-local-notification": "git+https://github.com/moodlemobile/cordova-plugin-local-notification.git#moodle",
"cordova-plugin-media-capture": "3.0.3", "cordova-plugin-media-capture": "^3.0.3",
"cordova-plugin-network-information": "2.0.2", "cordova-plugin-network-information": "^2.0.2",
"cordova-plugin-qrscanner": "git+https://github.com/moodlemobile/cordova-plugin-qrscanner.git#dist", "cordova-plugin-qrscanner": "git+https://github.com/moodlemobile/cordova-plugin-qrscanner.git#dist",
"cordova-plugin-screen-orientation": "3.0.2", "cordova-plugin-screen-orientation": "^3.0.2",
"cordova-plugin-splashscreen": "5.0.3", "cordova-plugin-splashscreen": "^6.0.0",
"cordova-plugin-statusbar": "2.4.3", "cordova-plugin-statusbar": "^2.4.3",
"cordova-plugin-whitelist": "1.3.4", "cordova-plugin-whitelist": "^1.3.4",
"cordova-plugin-wkuserscript": "git+https://github.com/moodlemobile/cordova-plugin-wkuserscript.git", "cordova-plugin-wkuserscript": "git+https://github.com/moodlemobile/cordova-plugin-wkuserscript.git",
"cordova-plugin-wkwebview-cookies": "git+https://github.com/moodlemobile/cordova-plugin-wkwebview-cookies.git", "cordova-plugin-wkwebview-cookies": "git+https://github.com/moodlemobile/cordova-plugin-wkwebview-cookies.git",
"cordova-plugin-zip": "3.1.0", "cordova-plugin-zip": "^3.1.0",
"cordova-sqlite-storage": "4.0.0", "cordova-sqlite-storage": "^4.0.0",
"cordova-support-google-services": "1.3.2", "cordova-support-google-services": "^1.3.2",
"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.9", "ionic-angular": "3.9.9",
"ionicons": "3.0.0", "ionicons": "3.0.0",
"jszip": "3.1.5", "jszip": "^3.1.5",
"mathjax": "2.7.7", "mathjax": "2.7.7",
"moment": "2.24.0", "moment": "^2.24.0",
"nl.kingsquare.cordova.background-audio": "1.0.1", "nl.kingsquare.cordova.background-audio": "^1.0.1",
"phonegap-plugin-multidex": "1.0.0", "phonegap-plugin-multidex": "^1.0.0",
"phonegap-plugin-push": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v3", "phonegap-plugin-push": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v3",
"promise.prototype.finally": "3.1.0", "promise.prototype.finally": "3.1.0",
"rxjs": "5.5.12", "rxjs": "^5.5.12",
"sw-toolbox": "3.6.0", "sw-toolbox": "^3.6.0",
"ts-md5": "1.2.7", "ts-md5": "^1.2.7",
"web-animations-js": "2.3.2", "web-animations-js": "^2.3.2",
"zone.js": "0.8.29" "zone.js": "^0.8.29"
}, },
"devDependencies": { "devDependencies": {
"@ionic/app-scripts": "3.2.3", "@ionic/app-scripts": "3.2.3",
"@ionic/cli": "^6.9.3", "@ionic/cli": "^6.9.3",
"@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.59", "@types/node": "^8.10.59",
"@types/promise.prototype.finally": "2.0.4", "@types/promise.prototype.finally": "^2.0.4",
"acorn": "^5.7.4", "acorn": "^5.7.4",
"electron-builder-lib": "20.23.1", "electron-builder-lib": "^20.23.1",
"electron-rebuild": "1.10.0", "electron-rebuild": "^1.10.0",
"gulp": "4.0.2", "gulp": "4.0.2",
"gulp-clip-empty-files": "0.1.2", "gulp-clip-empty-files": "^0.1.2",
"gulp-concat": "2.6.1", "gulp-concat": "^2.6.1",
"gulp-flatten": "0.4.0", "gulp-flatten": "^0.4.0",
"gulp-htmlmin": "5.0.1", "gulp-htmlmin": "^5.0.1",
"gulp-rename": "2.0.0", "gulp-rename": "^2.0.0",
"gulp-slash": "1.1.3", "gulp-slash": "^1.1.3",
"lodash.template": "4.5.0", "lodash.template": "^4.5.0",
"minimist": "^1.2.5", "minimist": "^1.2.5",
"native-run": "^1.0.0", "native-run": "^1.0.0",
"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",
"vinyl": "2.2.0", "vinyl": "^2.2.0",
"webpack-merge": "4.2.2" "webpack-merge": "^4.2.2"
}, },
"browser": { "browser": {
"electron": false "electron": false
@ -253,7 +253,7 @@
"category": "public.app-category.education", "category": "public.app-category.education",
"icon": "resources/desktop/icon.icns", "icon": "resources/desktop/icon.icns",
"target": "mas", "target": "mas",
"bundleVersion": "3.9.2", "bundleVersion": "3.9.3",
"extendInfo": { "extendInfo": {
"ElectronTeamID": "2NU57U5PAW" "ElectronTeamID": "2NU57U5PAW"
} }

4
src/config.json
View File

@ -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": 3920, "versioncode": 3930,
"versionname": "3.9.2", "versionname": "3.9.3-dev",
"cache_update_frequency_usually": 420000, "cache_update_frequency_usually": 420000,
"cache_update_frequency_often": 1200000, "cache_update_frequency_often": 1200000,
"cache_update_frequency_sometimes": 3600000, "cache_update_frequency_sometimes": 3600000,