Merge pull request #1806 from dpalou/MOBILE-2831

Mobile 2831
main
Juan Leyva 2019-03-13 11:16:01 +01:00 committed by GitHub
commit e3690ab2c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1313 additions and 480 deletions

View File

@ -139,9 +139,9 @@
<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="^2.2.3">
<plugin name="phonegap-plugin-push" spec="https://github.com/moodlemobile/phonegap-plugin-push.git#moodle-v2">
<variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
<variable name="FCM_VERSION" value="11.6.2" />
<variable name="FCM_VERSION" value="17.0.+" />
</plugin>
<edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application/activity[@android:name='MainActivity']">
<activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|screenLayout|smallestScreenSize" android:debuggable="true" />

1775
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -42,7 +42,7 @@
"@angular/animations": "^5.2.10",
"@angular/common": "^5.2.10",
"@angular/compiler": "^5.2.10",
"@angular/compiler-cli": "^5.2.10",
"@angular/compiler-cli": "^7.2.9",
"@angular/core": "^5.2.10",
"@angular/forms": "^5.2.10",
"@angular/http": "^5.2.10",
@ -102,7 +102,7 @@
"cordova-plugin-whitelist": "^1.3.3",
"cordova-plugin-zip": "^3.1.0",
"cordova-sqlite-storage": "^2.6.0",
"cordova-support-google-services": "^1.1.0",
"cordova-support-google-services": "^1.2.1",
"es6-promise-plugin": "^4.2.2",
"font-awesome": "^4.7.0",
"ionic-angular": "3.9.3",
@ -111,7 +111,7 @@
"moment": "^2.22.2",
"nl.kingsquare.cordova.background-audio": "^1.0.1",
"phonegap-plugin-multidex": "^1.0.0",
"phonegap-plugin-push": "^2.2.3",
"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",
@ -172,7 +172,7 @@
"nl.kingsquare.cordova.background-audio": {},
"phonegap-plugin-push": {
"ANDROID_SUPPORT_V13_VERSION": "27.+",
"FCM_VERSION": "11.6.2"
"FCM_VERSION": "17.0.+"
}
}
},