moodlehq · jleyva · Feb 28, 2018 · Dec 4, 2017 · Dec 4, 2017 · Dec 4, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ addons:
 language: node_js
 
 node_js:
-- '6.9.1'
+- '6.10.1'
 
 cache:
     directories:

diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?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.4.0">
+<widget xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" id="com.moodle.moodlemobile" version="3.4.1">
   <name>Moodle Mobile</name>
   <description>
         Moodle Mobile official app
@@ -33,6 +33,7 @@
   <preference name="iosPersistentFileLocation" value="Compatibility"/>
   <preference name="SplashScreen" value="screen"/>
   <preference name="SplashScreenDelay" value="3000"/>
+  <preference name="SplashMaintainAspectRatio" value="true"/>
   <feature name="StatusBar">
     <param name="ios-package" value="CDVStatusBar" onload="true"/>
   </feature>

diff --git a/desktop/assets/windows/AppXManifest.xml b/desktop/assets/windows/AppXManifest.xml
@@ -6,7 +6,7 @@
   <Identity Name="3312ADB7.MoodleDesktop"
     ProcessorArchitecture="x64"
     Publisher="CN=33CDCDF6-1EB5-4827-9897-ED25C91A32F6"
-    Version="3.4.0.0" />
+    Version="3.4.1.0" />
   <Properties>
     <DisplayName>Moodle Desktop</DisplayName>
     <PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>

diff --git a/e2e/lib.js b/e2e/lib.js
@@ -153,12 +153,12 @@ MM.loginAs = function (username, password) {
 
     browser.ignoreSynchronization = true;
     browser.waitForAngular();
-    browser.wait(EC.visibilityOf(element(by.model('siteurl'))), 15000);
+    browser.wait(EC.visibilityOf(element(by.model('loginData.siteurl'))), 15000);
 
-    element(by.model('siteurl'))
+    element(by.model('loginData.siteurl'))
         .sendKeys(SITEURL);
-    browser.wait(EC.elementToBeClickable($('[ng-click="connect(siteurl)"]')), 15000);
-    return $('[ng-click="connect(siteurl)"]').click()
+    browser.wait(EC.elementToBeClickable($('[ng-click="connect(loginData.siteurl)"]')), 15000);
+    return $('[ng-click="connect(loginData.siteurl)"]').click()
         .then(function () {
             waitForCondition();
             browser.wait(EC.visibilityOf($('[ng-click="login()"]')), 15000);

diff --git a/e2e/sauce/browser/protractor-sauce-browser-activities-3.js b/e2e/sauce/browser/protractor-sauce-browser-activities-3.js
@@ -13,7 +13,8 @@ exports.config = {
         "../../../e2e/*.js",
         "../../../www/**/e2e/mod_glossary.spec.js",
         "../../../www/**/e2e/mod_wiki.spec.js",
-        "../../../www/**/e2e/mod_data.spec.js"
+        "../../../www/**/e2e/mod_data.spec.js",
+        "../../../www/**/e2e/mod_workshop.spec.js"
     ],
     baseUrl: 'http://localhost:8100/',
     seleniumAddress: "http://" + process.env.SAUCE_USERNAME + ":" + process.env.SAUCE_ACCESS_KEY + "@ondemand.saucelabs.com:80/wd/hub",

diff --git a/e2e/sauce/protractor-sauce-android.js b/e2e/sauce/protractor-sauce-android.js
@@ -25,6 +25,7 @@ exports.config = {
         "../../../www/**/e2e/mod_glossary.spec.js",
         "../../../www/**/e2e/mod_wiki.spec.js",
         "../../../www/**/e2e/mod_data.spec.js",
+        "../../../www/**/e2e/mod_workshop.spec.js",
         "../../../www/**/e2e/notifications.spec.js",
         "../../../www/**/e2e/contacts.spec.js",
         "../../../www/**/e2e/messages.spec.js",
@@ -87,7 +88,7 @@ exports.config = {
         global.DEVICEURL = 'http://localhost:8100/';
         global.DEVICEVERSION = undefined;
         global.SITEURL = 'http://school.demo.moodle.net';
-        global.SITEVERSION = 3.3;
+        global.SITEVERSION = 3.4;
         global.SITEHASLM = false;
         global.USERS = {
             "STUDENT": {

diff --git a/e2e/sauce/protractor-sauce-ios.js b/e2e/sauce/protractor-sauce-ios.js
@@ -25,6 +25,7 @@ exports.config = {
         "../../../www/**/e2e/mod_glossary.spec.js",
         "../../../www/**/e2e/mod_wiki.spec.js",
         "../../../www/**/e2e/mod_data.spec.js",
+        "../../../www/**/e2e/mod_workshop.spec.js",
         "../../../www/**/e2e/notifications.spec.js",
         "../../../www/**/e2e/contacts.spec.js",
         "../../../www/**/e2e/messages.spec.js",
@@ -86,7 +87,7 @@ exports.config = {
         global.DEVICEURL = 'http://localhost:8100/';
         global.DEVICEVERSION = undefined;
         global.SITEURL = 'http://school.demo.moodle.net';
-        global.SITEVERSION = 3.3;
+        global.SITEVERSION = 3.4;
         global.SITEHASLM = false;
         global.USERS = {
             "STUDENT": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moodlemobile",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "The official app for Moodle.",
   "author": {
     "name": "Moodle Pty Ltd.",

diff --git a/upgrade.txt b/upgrade.txt
@@ -1,6 +1,10 @@
 This files describes API changes in the Moodle Mobile app,
 information provided here is intended especially for developers.
 
+=== 3.4.1 ===
+
+ * Some modules implemented a siteId param in the getDownloadSize of their prefetch handler. This param was never sent, so it has been replaced by a "single" param.
+
 === 3.4 ===
 
  * For performance reasons, $mmCoursesDelegate has changed a bit:

diff --git a/www/addons/badges/controllers/issuedbadge.js b/www/addons/badges/controllers/issuedbadge.js
@@ -31,6 +31,7 @@ angular.module('mm.addons.badges')
         var promises = [],
             promise;
 
+        $scope.currentTime = $mmUtil.timestamp();
         promise = $mmUser.getProfile($scope.userId, $scope.courseId, true).then(function(user) {
             $scope.user = user;
         });

diff --git a/www/addons/badges/controllers/userbadges.js b/www/addons/badges/controllers/userbadges.js
@@ -27,7 +27,7 @@ angular.module('mm.addons.badges')
     $scope.userId = $stateParams.userid || $mmSite.getUserId();
 
     function fetchBadges() {
-
+        $scope.currentTime = $mmUtil.timestamp();
         return $mmaBadges.getUserBadges($scope.courseId, $scope.userId).then(function(badges) {
             $scope.badges = badges;
         }).catch(function(message) {

diff --git a/www/addons/badges/lang/ar.json b/www/addons/badges/lang/ar.json
@@ -1,3 +1,4 @@
 {
-    "badges": "شارات"
+    "badges": "شارات",
+    "expired": "عذراً، تم إغلاق هذا النشاط في {{$a}} وهو غير متوفر الآن."
 }
diff --git a/www/addons/badges/lang/bg.json b/www/addons/badges/lang/bg.json
@@ -2,6 +2,7 @@
     "badgedetails": "Елементи на значката",
     "badges": "Значки",
     "contact": "Контакт",
+    "expired": "За съжаление тази дейност е затворена от {{$a}} и вече не е достъпна",
     "expirydate": "Дата на изтичане",
     "issuancedetails": "Срок на значката",
     "issuerdetails": "Данни за връчващия",

diff --git a/www/addons/badges/lang/ca.json b/www/addons/badges/lang/ca.json
@@ -3,6 +3,7 @@
     "badges": "Insígnies",
     "contact": "Contacte",
     "dateawarded": "Data publicada",
+    "expired": "Aquesta activitat es va tancar el dia {{$a}} i ja no està disponible.",
     "expirydate": "Data d'expiració",
     "issuancedetails": "Expiració de la insígnia",
     "issuerdetails": "Detalls de l'atorgador",

diff --git a/www/addons/badges/lang/cs.json b/www/addons/badges/lang/cs.json
@@ -3,6 +3,7 @@
     "badges": "Odznaky",
     "contact": "Kontakt",
     "dateawarded": "Datum udělení",
+    "expired": "Je nám líto, tato činnost byla uzavřena {{$a}} a není nadále dostupná",
     "expirydate": "Datum vypršení platnosti",
     "issuancedetails": "Vypršení platnosti odznaku",
     "issuerdetails": "Podrobnosti o vydavateli",

diff --git a/www/addons/badges/lang/da.json b/www/addons/badges/lang/da.json
@@ -3,6 +3,7 @@
     "badges": "Badges",
     "contact": "Kontakt",
     "dateawarded": "Udstedelsesdato",
+    "expired": "Beklager, denne aktivitet er lukket d. {{$a}} og er ikke længere tilgængelig",
     "expirydate": "Udløbsdato",
     "issuancedetails": "Badge-udløb",
     "issuerdetails": "Udstederdata",

diff --git a/www/addons/badges/lang/de-du.json b/www/addons/badges/lang/de-du.json
@@ -3,6 +3,7 @@
     "badges": "Auszeichnungen",
     "contact": "Kontakt",
     "dateawarded": "Verleihdatum",
+    "expired": "Diese Abstimmung ist seit {{$a}} beendet. Eine Auswahl ist nicht mehr möglich.",
     "expirydate": "Ablaufdatum",
     "issuancedetails": "Ablauf festlegen",
     "issuerdetails": "Verleiher",

diff --git a/www/addons/badges/lang/de.json b/www/addons/badges/lang/de.json
@@ -3,6 +3,7 @@
     "badges": "Auszeichnungen",
     "contact": "Kontakt",
     "dateawarded": "Verleihdatum",
+    "expired": "Diese Abstimmung ist seit {{$a}} beendet. Eine Auswahl ist nicht mehr möglich.",
     "expirydate": "Ablaufdatum",
     "issuancedetails": "Ablauf festlegen",
     "issuerdetails": "Verleiher",

diff --git a/www/addons/badges/lang/el.json b/www/addons/badges/lang/el.json
@@ -1,3 +1,4 @@
 {
-    "badges": "Κονκάρδες"
+    "badges": "Βραβεία",
+    "expired": "Η δραστηριότητα αυτή έκλεισε στις {{$a}} και δεν είναι πλέον διαθέσιμη"
 }
diff --git a/www/addons/badges/lang/en.json b/www/addons/badges/lang/en.json
@@ -3,6 +3,7 @@
     "badges": "Badges",
     "contact": "Contact",
     "dateawarded": "Date issued",
+    "expired": "Expired",
     "expirydate": "Expiry date",
     "issuancedetails": "Badge expiry",
     "issuerdetails": "Issuer details",

diff --git a/www/addons/badges/lang/es-mx.json b/www/addons/badges/lang/es-mx.json
@@ -3,6 +3,7 @@
     "badges": "Insignias",
     "contact": "Contacto",
     "dateawarded": "Fecha de emisión",
+    "expired": "Lo sentimos, esta actividad se cerró el {{$a}} y ya no está disponible",
     "expirydate": "Fecha de caducidad",
     "issuancedetails": "Caducidad de insignia",
     "issuerdetails": "Detalles del emisor",

diff --git a/www/addons/badges/lang/es.json b/www/addons/badges/lang/es.json
@@ -3,6 +3,7 @@
     "badges": "Insignias",
     "contact": "Contacto",
     "dateawarded": "Fecha de la emisión",
+    "expired": "Lo sentimos, esta actividad se cerró el {{$a}} y ya no está disponible",
     "expirydate": "Fecha de expiración",
     "issuancedetails": "Caducidad de la insignia",
     "issuerdetails": "Detalles del emisor",

diff --git a/www/addons/badges/lang/eu.json b/www/addons/badges/lang/eu.json
@@ -3,6 +3,7 @@
     "badges": "Dominak",
     "contact": "Kontaktua",
     "dateawarded": "Emate-data",
+    "expired": "Sentitzen dugu, jarduera hau {{$a}}(e)an itxi zen eta dagoeneko ez dago eskuragarri.",
     "expirydate": "Epemugaren data",
     "issuancedetails": "Dominaren iraungitzea",
     "issuerdetails": "Emailearen xehetasunak",

diff --git a/www/addons/badges/lang/fa.json b/www/addons/badges/lang/fa.json
@@ -3,6 +3,7 @@
     "badges": "مدال‌ها",
     "contact": "تماس",
     "dateawarded": "تاریخ صدور",
+    "expired": "با عرض پوزش، این فعالیت در {{$a}} بسته شد و دیگر در دسترس نیست",
     "expirydate": "تاریخ انقضا",
     "issuancedetails": "انقضای مدال",
     "issuerdetails": "مشخصات صادرکننده",

diff --git a/www/addons/badges/lang/fi.json b/www/addons/badges/lang/fi.json
@@ -3,6 +3,7 @@
     "badges": "Osaamismerkit",
     "contact": "Yhteystieto",
     "dateawarded": "Myöntämispäivä",
+    "expired": "Tämä aktiviteeti on suljettu {{$a}} eikä ole enää käytettävissä.",
     "expirydate": "Vanhenemispäivä",
     "issuancedetails": "Osaamismerkin vanhentuminen",
     "issuerdetails": "Osaamismerkin myöntäjän tiedot",

diff --git a/www/addons/badges/lang/fr.json b/www/addons/badges/lang/fr.json
@@ -3,6 +3,7 @@
     "badges": "Badges",
     "contact": "Contact",
     "dateawarded": "Date de remise",
+    "expired": "Désolé, cette activité s'est terminée le {{$a}} et n'est plus disponible",
     "expirydate": "Date d'échéance",
     "issuancedetails": "Échéance du badge",
     "issuerdetails": "Détail de l'émetteur",

diff --git a/www/addons/badges/lang/he.json b/www/addons/badges/lang/he.json
@@ -3,6 +3,7 @@
     "badges": "הישגים",
     "contact": "ליצירת קשר",
     "dateawarded": "תאריך הקבלה",
+    "expired": "מצטערים, פעילות זו נסגרה על {{$a}} והיא איננה זמינה יותר",
     "expirydate": "תאריך תפוגה",
     "issuancedetails": "מועד תפוגת ההישג",
     "issuerdetails": "פרטי הגורם אשר העניק את ההישג",

diff --git a/www/addons/badges/lang/hr.json b/www/addons/badges/lang/hr.json
@@ -3,6 +3,7 @@
     "badges": "Značke",
     "contact": "Kontakt",
     "dateawarded": "Datum izdavanja",
+    "expired": "Nažalost, ova aktivnost je zatvorena od {{$a}} i nije više dostupna",
     "expirydate": "Datum isteka",
     "issuancedetails": "Istek značke",
     "issuerdetails": "Detalji o izdavaču",

diff --git a/www/addons/badges/lang/hu.json b/www/addons/badges/lang/hu.json
@@ -3,6 +3,7 @@
     "badges": "Kitűzők",
     "contact": "Kapcsolat",
     "dateawarded": "Kiadás dátuma",
+    "expired": "Ez a tevékenység {{$a}} időpontban lezárult és már nem érhető el",
     "expirydate": "Lejárat időpontja",
     "issuancedetails": "A kitűző lejárata",
     "issuerdetails": "Az adományozó adatai",

diff --git a/www/addons/badges/lang/it.json b/www/addons/badges/lang/it.json
@@ -3,6 +3,7 @@
     "badges": "Badge",
     "contact": "Contatto",
     "dateawarded": "Data di rilascio",
+    "expired": "Spiacente, questa attività è stata chiusa il {{$a}} e non è più disponibile",
     "expirydate": "Data di scadenza",
     "issuancedetails": "Scadenza badge",
     "issuerdetails": "Dettagli di chi rilascia il badge",

diff --git a/www/addons/badges/lang/ja.json b/www/addons/badges/lang/ja.json
@@ -3,6 +3,7 @@
     "badges": "バッジ",
     "contact": "連絡先",
     "dateawarded": "発効日",
+    "expired": "申し訳ございません、この活動は {{$a}} に終了しているため、これ以上利用することはできません。",
     "expirydate": "有効期限",
     "issuancedetails": "バッジ有効期限",
     "issuerdetails": "発行者詳細",

diff --git a/www/addons/badges/lang/ko.json b/www/addons/badges/lang/ko.json
@@ -0,0 +1,13 @@
+{
+    "badgedetails": "뱃지 세부사항",
+    "badges": "뱃지",
+    "contact": "연락처",
+    "dateawarded": "발행일",
+    "expired": "죄송합니다. 이 활동은 {{$a}} 에 종료되어서 더 이상 사용할 수 없습니다.",
+    "expirydate": "만료일",
+    "issuancedetails": "뱃지 만료기한",
+    "issuerdetails": "발행자 세부정보",
+    "issuername": "발행자 이름",
+    "nobadges": "사용가능한 뱃지가 없습니다.",
+    "recipientdetails": "수신자 세부사항"
+}
diff --git a/www/addons/badges/lang/lt.json b/www/addons/badges/lang/lt.json
@@ -3,6 +3,7 @@
     "badges": "Pasiekimai",
     "contact": "Kontaktas",
     "dateawarded": "Suteikimo data",
+    "expired": "Atsiprašome, veikla uždaryta {{$a}} ir nebegalima",
     "expirydate": "Galiojimo laikas",
     "issuancedetails": "Pasiekimo galiojimas",
     "issuerdetails": "Suteikėjo detalesnė informacija",

diff --git a/www/addons/badges/lang/mr.json b/www/addons/badges/lang/mr.json
@@ -0,0 +1,3 @@
+{
+    "expired": "संपलेला"
+}
diff --git a/www/addons/badges/lang/nl.json b/www/addons/badges/lang/nl.json
@@ -3,6 +3,7 @@
     "badges": "Badges",
     "contact": "Contact",
     "dateawarded": "Uitgavedatum",
+    "expired": "Sorry, deze activiteit is afgesloten op {{$a}} en is niet meer beschikbaar",
     "expirydate": "Vervaldatum",
     "issuancedetails": "Badge verloopt",
     "issuerdetails": "Details uitgever",

diff --git a/www/addons/badges/lang/no.json b/www/addons/badges/lang/no.json
@@ -3,6 +3,7 @@
     "badges": "Utmerkelser",
     "contact": "Kontakt",
     "dateawarded": "Dato tildelt",
+    "expired": "Beklager, denne aktiviteten ble stengt {{$a}} og er ikke tilgjengelig lenger.",
     "expirydate": "Utløpsdato",
     "issuancedetails": "Utløpsdato på utmerkelse",
     "issuerdetails": "Utstederdetaljer",

diff --git a/www/addons/badges/lang/pl.json b/www/addons/badges/lang/pl.json
@@ -1,11 +1,12 @@
 {
-    "badgedetails": "Szczegóły odznak",
+    "badgedetails": "Szczegóły odznaki",
     "badges": "Odznaki",
-    "contact": "Połącz",
+    "contact": "Kontakt",
     "dateawarded": "Data wydania",
+    "expired": "Niestety ta aktywność została zamknięta {{$a}} i nie jest już dostępna.",
     "expirydate": "Data ważności",
     "issuancedetails": "Wygaśnięcie odznaki",
-    "issuerdetails": "Szczegóły o wydawcy",
+    "issuerdetails": "Dane wystawcy",
     "issuername": "Nazwa wydawcy",
     "nobadges": "Brak dostępnych odznak",
     "recipientdetails": "Dane odbiorcy"

diff --git a/www/addons/badges/lang/pt-br.json b/www/addons/badges/lang/pt-br.json
@@ -3,6 +3,7 @@
     "badges": "Emblemas",
     "contact": "Contato",
     "dateawarded": "Data de emissão",
+    "expired": "Esta atividade está encerrada desde {{$a}}",
     "expirydate": "Data de validade",
     "issuancedetails": "Expiração do emblema",
     "issuerdetails": "Detalhes do emissor",

diff --git a/www/addons/badges/lang/pt.json b/www/addons/badges/lang/pt.json
@@ -3,6 +3,7 @@
     "badges": "Medalhas",
     "contact": "Contacto",
     "dateawarded": "Data de emissão",
+    "expired": "Esta atividade terminou em {{$a}} e já não está disponível",
     "expirydate": "Data de validade",
     "issuancedetails": "Data de validade da Medalha",
     "issuerdetails": "Detalhes do emissor",

diff --git a/www/addons/badges/lang/ro.json b/www/addons/badges/lang/ro.json
@@ -3,6 +3,7 @@
     "badges": "Ecusoane",
     "contact": "Contact",
     "dateawarded": "Data emiterii",
+    "expired": "Ne pare rău, această activitate s-a închis la {{$a}} şi nu mai este disponibilă",
     "expirydate": "Dată de expirare",
     "issuancedetails": "Expirare ecuson",
     "issuerdetails": "Detalii emitent",

diff --git a/www/addons/badges/lang/ru.json b/www/addons/badges/lang/ru.json
@@ -3,6 +3,7 @@
     "badges": "Значки",
     "contact": "Контакты",
     "dateawarded": "Дата выдачи",
+    "expired": "Извините, этот элемент курса закрыт {{$a}} и более недоступен",
     "expirydate": "Дата окончания срока действия",
     "issuancedetails": "Срок действия значка",
     "issuerdetails": "Сведения об эмитенте",

diff --git a/www/addons/badges/lang/sv.json b/www/addons/badges/lang/sv.json
@@ -3,6 +3,7 @@
     "badges": "Märken",
     "contact": "Kontakt",
     "dateawarded": "Utfärdandedatum",
+    "expired": "Den här aktiviteten är stängd på {{$a}} och den är inte längre tillgänglig.",
     "expirydate": "Förfallodatum",
     "issuancedetails": "Förfallande av märke",
     "issuerdetails": "Utfärdarens detaljer",

diff --git a/www/addons/badges/lang/tr.json b/www/addons/badges/lang/tr.json
@@ -3,6 +3,7 @@
     "badges": "Nişanlar",
     "contact": "İletişim",
     "dateawarded": "Verilen tarih",
+    "expired": "Üzgünüz, bu etkinlik {{$a}} tarihinde kapandı ve bu etkinliğe artık ulaşılamaz",
     "expirydate": "Bitiş Tarihi",
     "issuancedetails": "Rozet sona erme",
     "issuerdetails": "çıkaran ayrıntıları",