Merge pull request moodlehq#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="mobile@moodle.com">
+  <author href="http://moodle.com" email="mobile@moodle.com">
         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/icon@2x.png" width="114" height="114"/>
-        <icon src="resources/ios/icon/icon-40.png" width="40" height="40"/>
-        <icon src="resources/ios/icon/icon-40@2x.png" width="80" height="80"/>
-        <icon src="resources/ios/icon/icon-40@3x.png" width="120" height="120"/>
-        <icon src="resources/ios/icon/icon-50.png" width="50" height="50"/>
-        <icon src="resources/ios/icon/icon-50@2x.png" width="100" height="100"/>
-        <icon src="resources/ios/icon/icon-60.png" width="60" height="60"/>
-        <icon src="resources/ios/icon/icon-60@2x.png" width="120" height="120"/>
-        <icon src="resources/ios/icon/icon-60@3x.png" width="180" height="180"/>
-        <icon src="resources/ios/icon/icon-72.png" width="72" height="72"/>
-        <icon src="resources/ios/icon/icon-72@2x.png" width="144" height="144"/>
-        <icon src="resources/ios/icon/icon-76.png" width="76" height="76"/>
-        <icon src="resources/ios/icon/icon-76@2x.png" width="152" height="152"/>
-        <icon src="resources/ios/icon/icon-83.5@2x.png" width="167" height="167"/>
-        <icon src="resources/ios/icon/icon-small.png" width="29" height="29"/>
-        <icon src="resources/ios/icon/icon-small@2x.png" width="58" height="58"/>
-        <icon src="resources/ios/icon/icon-small@3x.png" width="87" height="87"/>
-    </platform>
-    <icon src="resources/ios/icon/icon-small@3x.png"/>
+  <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/icon@2x.png" width="114" height="114"/>
+    <icon src="resources/ios/icon/icon-40.png" width="40" height="40"/>
+    <icon src="resources/ios/icon/icon-40@2x.png" width="80" height="80"/>
+    <icon src="resources/ios/icon/icon-40@3x.png" width="120" height="120"/>
+    <icon src="resources/ios/icon/icon-50.png" width="50" height="50"/>
+    <icon src="resources/ios/icon/icon-50@2x.png" width="100" height="100"/>
+    <icon src="resources/ios/icon/icon-60.png" width="60" height="60"/>
+    <icon src="resources/ios/icon/icon-60@2x.png" width="120" height="120"/>
+    <icon src="resources/ios/icon/icon-60@3x.png" width="180" height="180"/>
+    <icon src="resources/ios/icon/icon-72.png" width="72" height="72"/>
+    <icon src="resources/ios/icon/icon-72@2x.png" width="144" height="144"/>
+    <icon src="resources/ios/icon/icon-76.png" width="76" height="76"/>
+    <icon src="resources/ios/icon/icon-76@2x.png" width="152" height="152"/>
+    <icon src="resources/ios/icon/icon-83.5@2x.png" width="167" height="167"/>
+    <icon src="resources/ios/icon/icon-small.png" width="29" height="29"/>
+    <icon src="resources/ios/icon/icon-small@2x.png" width="58" height="58"/>
+    <icon src="resources/ios/icon/icon-small@3x.png" 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/icon-small@3x.png"/>
 </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.",

resources/ios/icon/icon-40.png

@@ -1,6 +1,10 @@
 This files describes API changes in the Moodle Mobile app,
 information provided here is intended especially for developers.
 
+=== 3.3.2 ===
+
+ * Handlers registered in $mmFileUploaderDelegate now need to implement a function getSupportedMimeTypes. This function will receive a list of mimetypes and needs to return the ones supported by the handler. Also, the handler's action and afterRender functions now receive a new parameter: mimetypes.
+
 === 3.3 ===
 
  * The project now supports Ionic CLI v2 and Node 6.9. We recommend updating node, npm, Ionic CLI and project dependencies:

resources/ios/icon/icon-40@2x.png

@@ -0,0 +1,8 @@
+{
+    "calendarevents": "Kalender",
+    "defaultnotificationtime": "Standardmäßige Benachrichtigungszeit",
+    "errorloadevent": "Fehler beim Laden des Kalendereintrags",
+    "errorloadevents": "Fehler beim Laden der Kalendereinträge",
+    "noevents": "Keine Kalendereinträge",
+    "notifications": "Systemmitteilungen"
+}

resources/ios/icon/icon-40@3x.png

@@ -4,5 +4,5 @@
     "errorloadevent": "Fehler beim Laden des Kalendereintrags",
     "errorloadevents": "Fehler beim Laden der Kalendereinträge",
     "noevents": "Keine Kalendereinträge",
-    "notifications": "Benachrichtigung"
+    "notifications": "Systemmitteilungen"
 }

resources/ios/icon/icon-50.png

@@ -3,6 +3,6 @@
     "defaultnotificationtime": "زمان پیش‌فرض اطلاع‌رسانی",
     "errorloadevent": "خطا در بارگیری رویداد.",
     "errorloadevents": "خطا در بارگیری رویدادها.",
-    "noevents": "هیچ مهلتی برای فعالیت‌های آتی وجود ندارد",
-    "notifications": "تذکرات"
+    "noevents": "هیچ رویدادی نیست",
+    "notifications": "هشدارها"
 }

resources/ios/icon/icon-50@2x.png

@@ -0,0 +1,4 @@
+{
+    "errornocompetenciesfound": "Keine Kompetenzen gefunden",
+    "nocompetencies": "Keine Kompetenzen"
+}

resources/ios/icon/icon-60.png

@@ -0,0 +1,21 @@
+{
+    "complete": "Abschließen",
+    "completecourse": "Kurs abschließen",
+    "completed": "Abgeschlossen",
+    "completiondate": "Abschlussdatum",
+    "couldnotloadreport": "Fehler beim Laden des Kursabschlussberichts. Versuche es später noch einmal.",
+    "coursecompletion": "Kursabschluss",
+    "criteria": "Kriterien",
+    "criteriagroup": "Kriteriengruppe",
+    "criteriarequiredall": "Alle nachfolgenden Kriterien sind notwendig.",
+    "criteriarequiredany": "Ein nachfolgendes Kriterium ist notwendig.",
+    "inprogress": "In Arbeit",
+    "manualselfcompletion": "Manueller Selbstabschluss",
+    "notyetstarted": "Nicht begonnen",
+    "pending": "Nicht erledigt",
+    "required": "Notwendig",
+    "requiredcriteria": "Notwendige Kriterien",
+    "requirement": "Anforderung",
+    "status": "Status",
+    "viewcoursereport": "Kursbericht anzeigen"
+}

resources/ios/icon/icon-60@2x.png

@@ -12,6 +12,6 @@
     "pending": "معلق",
     "required": "الزامی بودن",
     "requiredcriteria": "ضوابط مورد نیاز",
-    "status": "وضعیت مدال",
-    "viewcoursereport": "مشاهده گزارش درس"
+    "status": "وضعیت",
+    "viewcoursereport": "مشاهدهٔ گزارش درس"
 }

resources/ios/icon/icon-60@3x.png

@@ -1,21 +1,21 @@
 {
-    "complete": "Finalizează",
+    "complete": "Complet",
     "completecourse": "Curs complet",
-    "completed": "Finalizare",
+    "completed": "Complet",
     "completiondate": "Data limita până la completarea acțiunii",
     "couldnotloadreport": "Raportul cu privire la situația completării cursului nu se poate încărca, încercați mai târziu.",
-    "coursecompletion": "Absolvire curs",
+    "coursecompletion": "Completarea cursului",
     "criteria": "Criterii",
-    "criteriagroup": "Grup criterii",
-    "criteriarequiredall": "Toate criteriile de mai jos sunt necesare",
-    "criteriarequiredany": "Oricare dintre criteriile de mai jos sunt necesare",
-    "inprogress": "În curs",
-    "manualselfcompletion": "Auto-finalizare manuală",
-    "notyetstarted": "Nu a fost încă început",
-    "pending": "În așteptare",
-    "required": "Necesar",
-    "requiredcriteria": "Criteriu necesar",
+    "criteriagroup": "Criterii pentru grup",
+    "criteriarequiredall": "Indeplinirea următoarelor criterii este obligatorie",
+    "criteriarequiredany": "Oricare din urmatoarele criterii sunt obligatorii",
+    "inprogress": "În progres",
+    "manualselfcompletion": "Autocompletare",
+    "notyetstarted": "Înca nu a început",
+    "pending": "În asteptare",
+    "required": "Obligatoriu",
+    "requiredcriteria": "Criterii obligatorii",
     "requirement": "Cerințe",
-    "status": "Status",
-    "viewcoursereport": "Vezi raportul cursului"
+    "status": "Situație",
+    "viewcoursereport": "Vizualizați raportul despre curs"
 }

resources/ios/icon/icon-72.png

@@ -0,0 +1,10 @@
+{
+    "admindisableddownload": "Das Herunterladen von Dateien ist deaktiviert. Du kannst nur die Dateiliste sehen.",
+    "clicktoupload": "Tippe auf die Taste, um Dateien in den Bereich 'Meine Dateien' hochzuladen.",
+    "couldnotloadfiles": "Die Liste der Dateien konnte nicht geladen werden.",
+    "emptyfilelist": "Keine Dateien",
+    "erroruploadnotworking": "Im Moment können keine Dateien zur Website hochgeladen werden.",
+    "myprivatefilesdesc": "Dateien, die in deinem persönlichen Bereich auf dieser Website liegen.",
+    "sitefilesdesc": "Weitere Dateien, die für dich in anderen Bereichen der Website verfügbar sind.",
+    "uploadfiles": "Dateien hochladen"
+}

resources/ios/icon/icon-72@2x.png

@@ -2,7 +2,7 @@
     "admindisableddownload": "Atenție! Administratorul platformei a dezactivat descărcarea de fișiere; puteți accesa fișierele dar nu le puteți descărca.",
     "clicktoupload": "Apăsați butonul de mai jos pentru a încarcă fișierele în contul dumneavoastră.",
     "couldnotloadfiles": "Lista fișierelor nu a putut fi încărcată.",
-    "emptyfilelist": "Nu există fișiere",
+    "emptyfilelist": "Nu sunt fișiere disponibile.",
     "files": "Fișiere",
     "myprivatefilesdesc": "Fișierele disponibile din zona personală, pe care o dețineți pe acest site.",
     "privatefiles": "Fișiere private",

resources/ios/icon/icon-76.png

@@ -0,0 +1,3 @@
+{
+    "processorsettingsdesc": "Geräte konfigurieren"
+}