Merge pull request #1147 from moodlehq/integration

Integration

Author: jleyva

config.xml

@@ -1,89 +1,91 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" id="com.moodle.moodlemobile" version="3.3.1">
-    <name>Moodle Mobile</name>
-    <description>
+<widget xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" id="com.moodle.moodlemobile" version="3.3.2">
+  <name>Moodle Mobile</name>
+  <description>
         Moodle Mobile official app
     </description>
-    <author href="http://moodle.com" email="[email protected]">
+  <author href="http://moodle.com" email="[email protected]">
         Moodle Mobile team
     </author>
-    <content src="index.html"/>
-    <access origin="*"/>
-    <access origin="tel:*" launch-external="yes"/>
-    <access origin="mailto:*" launch-external="yes"/>
-    <access origin="geo:*" launch-external="yes"/>
-    <allow-navigation href="cdvfile:*"/>
-    <allow-navigation href="content:*"/>
-    <allow-navigation href="data:*"/>
-    <allow-navigation href="*"/>
-    <allow-intent href="*"/>
-    <preference name="orientation" value="default"/>
-    <preference name="target-device" value="universal"/>
-    <preference name="fullscreen" value="false"/>
-    <preference name="webviewbounce" value="false"/>
-    <preference name="AppendUserAgent" value="MoodleMobile"/>
-    <preference name="android-minSdkVersion" value="14"/>
-    <preference name="android-targetSdkVersion" value="19"/>
-    <preference name="UIWebViewBounce" value="false"/>
-    <preference name="DisallowOverscroll" value="true"/>
-    <preference name="BackupWebStorage" value="none"/>
-    <preference name="KeyboardDisplayRequiresUserAction" value="false"/>
-    <preference name="AndroidPersistentFileLocation" value="Compatibility"/>
-    <preference name="iosPersistentFileLocation" value="Compatibility"/>
-    <preference name="SplashScreen" value="screen"/>
-    <preference name="SplashScreenDelay" value="3000"/>
-    <feature name="StatusBar">
-        <param name="ios-package" value="CDVStatusBar" onload="true"/>
-    </feature>
-    <platform name="android">
-        <splash src="resources/android/splash/drawable-land-ldpi-screen.png" qualifier="land-ldpi"/>
-        <splash src="resources/android/splash/drawable-land-mdpi-screen.png" qualifier="land-mdpi"/>
-        <splash src="resources/android/splash/drawable-land-hdpi-screen.png" qualifier="land-hdpi"/>
-        <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" qualifier="land-xhdpi"/>
-        <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" qualifier="land-xxhdpi"/>
-        <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" qualifier="land-xxxhdpi"/>
-        <splash src="resources/android/splash/drawable-port-ldpi-screen.png" qualifier="port-ldpi"/>
-        <splash src="resources/android/splash/drawable-port-mdpi-screen.png" qualifier="port-mdpi"/>
-        <splash src="resources/android/splash/drawable-port-hdpi-screen.png" qualifier="port-hdpi"/>
-        <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" qualifier="port-xhdpi"/>
-        <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" qualifier="port-xxhdpi"/>
-        <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" qualifier="port-xxxhdpi"/>
-        <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
-        <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
-        <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
-        <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
-        <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
-        <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
-    </platform>
-    <platform name="ios">
-        <splash src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" height="1136"/>
-        <splash src="resources/ios/splash/Default-667h.png" width="750" height="1334"/>
-        <splash src="resources/ios/splash/Default-736h.png" width="1242" height="2208"/>
-        <splash src="resources/ios/splash/Default-Landscape-736h.png" width="2208" height="1242"/>
-        <splash src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" height="1536"/>
-        <splash src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" height="768"/>
-        <splash src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
-        <splash src="resources/ios/splash/Default-Portrait~ipad.png" width="768" height="1024"/>
-        <splash src="resources/ios/splash/Default@2x~iphone.png" width="640" height="960"/>
-        <splash src="resources/ios/splash/Default~iphone.png" width="320" height="480"/>
-        <icon src="resources/ios/icon/icon.png" width="57" height="57"/>
-        <icon src="resources/ios/icon/[email protected]" width="114" height="114"/>
-        <icon src="resources/ios/icon/icon-40.png" width="40" height="40"/>
-        <icon src="resources/ios/icon/[email protected]" width="80" height="80"/>
-        <icon src="resources/ios/icon/[email protected]" width="120" height="120"/>
-        <icon src="resources/ios/icon/icon-50.png" width="50" height="50"/>
-        <icon src="resources/ios/icon/[email protected]" width="100" height="100"/>
-        <icon src="resources/ios/icon/icon-60.png" width="60" height="60"/>
-        <icon src="resources/ios/icon/[email protected]" width="120" height="120"/>
-        <icon src="resources/ios/icon/[email protected]" width="180" height="180"/>
-        <icon src="resources/ios/icon/icon-72.png" width="72" height="72"/>
-        <icon src="resources/ios/icon/[email protected]" width="144" height="144"/>
-        <icon src="resources/ios/icon/icon-76.png" width="76" height="76"/>
-        <icon src="resources/ios/icon/[email protected]" width="152" height="152"/>
-        <icon src="resources/ios/icon/[email protected]" width="167" height="167"/>
-        <icon src="resources/ios/icon/icon-small.png" width="29" height="29"/>
-        <icon src="resources/ios/icon/[email protected]" width="58" height="58"/>
-        <icon src="resources/ios/icon/[email protected]" width="87" height="87"/>
-    </platform>
-    <icon src="resources/ios/icon/[email protected]"/>
+  <content src="index.html"/>
+  <access origin="*"/>
+  <access origin="tel:*" launch-external="yes"/>
+  <access origin="mailto:*" launch-external="yes"/>
+  <access origin="geo:*" launch-external="yes"/>
+  <allow-navigation href="cdvfile:*"/>
+  <allow-navigation href="content:*"/>
+  <allow-navigation href="data:*"/>
+  <allow-navigation href="*"/>
+  <allow-intent href="*"/>
+  <preference name="orientation" value="default"/>
+  <preference name="target-device" value="universal"/>
+  <preference name="fullscreen" value="false"/>
+  <preference name="webviewbounce" value="false"/>
+  <preference name="AppendUserAgent" value="MoodleMobile"/>
+  <preference name="android-minSdkVersion" value="14"/>
+  <preference name="android-targetSdkVersion" value="19"/>
+  <preference name="UIWebViewBounce" value="false"/>
+  <preference name="DisallowOverscroll" value="true"/>
+  <preference name="BackupWebStorage" value="none"/>
+  <preference name="KeyboardDisplayRequiresUserAction" value="false"/>
+  <preference name="AndroidPersistentFileLocation" value="Compatibility"/>
+  <preference name="iosPersistentFileLocation" value="Compatibility"/>
+  <preference name="SplashScreen" value="screen"/>
+  <preference name="SplashScreenDelay" value="3000"/>
+  <feature name="StatusBar">
+    <param name="ios-package" value="CDVStatusBar" onload="true"/>
+  </feature>
+  <platform name="android">
+    <splash src="resources/android/splash/drawable-land-ldpi-screen.png" qualifier="land-ldpi"/>
+    <splash src="resources/android/splash/drawable-land-mdpi-screen.png" qualifier="land-mdpi"/>
+    <splash src="resources/android/splash/drawable-land-hdpi-screen.png" qualifier="land-hdpi"/>
+    <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" qualifier="land-xhdpi"/>
+    <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" qualifier="land-xxhdpi"/>
+    <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" qualifier="land-xxxhdpi"/>
+    <splash src="resources/android/splash/drawable-port-ldpi-screen.png" qualifier="port-ldpi"/>
+    <splash src="resources/android/splash/drawable-port-mdpi-screen.png" qualifier="port-mdpi"/>
+    <splash src="resources/android/splash/drawable-port-hdpi-screen.png" qualifier="port-hdpi"/>
+    <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" qualifier="port-xhdpi"/>
+    <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" qualifier="port-xxhdpi"/>
+    <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" qualifier="port-xxxhdpi"/>
+    <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
+    <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
+    <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
+    <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
+    <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
+    <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
+  </platform>
+  <platform name="ios">
+    <icon src="resources/ios/icon/icon.png" width="57" height="57"/>
+    <icon src="resources/ios/icon/[email protected]" width="114" height="114"/>
+    <icon src="resources/ios/icon/icon-40.png" width="40" height="40"/>
+    <icon src="resources/ios/icon/[email protected]" width="80" height="80"/>
+    <icon src="resources/ios/icon/[email protected]" width="120" height="120"/>
+    <icon src="resources/ios/icon/icon-50.png" width="50" height="50"/>
+    <icon src="resources/ios/icon/[email protected]" width="100" height="100"/>
+    <icon src="resources/ios/icon/icon-60.png" width="60" height="60"/>
+    <icon src="resources/ios/icon/[email protected]" width="120" height="120"/>
+    <icon src="resources/ios/icon/[email protected]" width="180" height="180"/>
+    <icon src="resources/ios/icon/icon-72.png" width="72" height="72"/>
+    <icon src="resources/ios/icon/[email protected]" width="144" height="144"/>
+    <icon src="resources/ios/icon/icon-76.png" width="76" height="76"/>
+    <icon src="resources/ios/icon/[email protected]" width="152" height="152"/>
+    <icon src="resources/ios/icon/[email protected]" width="167" height="167"/>
+    <icon src="resources/ios/icon/icon-small.png" width="29" height="29"/>
+    <icon src="resources/ios/icon/[email protected]" width="58" height="58"/>
+    <icon src="resources/ios/icon/[email protected]" width="87" height="87"/>
+    <splash src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" height="1136"/>
+    <splash src="resources/ios/splash/Default-667h.png" width="750" height="1334"/>
+    <splash src="resources/ios/splash/Default-736h.png" width="1242" height="2208"/>
+    <splash src="resources/ios/splash/Default-Landscape-736h.png" width="2208" height="1242"/>
+    <splash src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" height="1536"/>
+    <splash src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732" height="2048"/>
+    <splash src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" height="768"/>
+    <splash src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
+    <splash src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" height="2732"/>
+    <splash src="resources/ios/splash/Default-Portrait~ipad.png" width="768" height="1024"/>
+    <splash src="resources/ios/splash/Default@2x~iphone.png" width="640" height="960"/>
+    <splash src="resources/ios/splash/Default~iphone.png" width="320" height="480"/>
+  </platform>
+  <icon src="resources/ios/icon/[email protected]"/>
 </widget>

gulpfile.js

@@ -125,6 +125,10 @@ function treatMergedData(data) {
 
       addProperties(merged, data[filepath], 'mm.core.country-');
 
+    } else if (filepath.indexOf('core/assets/mimetypes') === 0) {
+
+      addProperties(merged, data[filepath], 'mm.core.mimetype-');
+
     }
   }
 
@@ -352,6 +356,7 @@ var paths = {
     './www/core/components/**/lang/',
     './www/addons/**/lang/',
     './www/core/assets/countries/',
+    './www/core/assets/mimetypes/',
     '!./www/**/' + remoteAddonPackageFolder + '/*.json',
     '!./www/**/' + remoteAddonPackageFolder + '/**/*.json',
   ],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moodlemobile",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "The official app for Moodle.",
   "author": {
     "name": "Moodle Pty Ltd.",