Merge pull request #1255 from moodlehq/integration

Integration

Author: jleyva

.travis.yml

@@ -15,7 +15,7 @@ addons:
 language: node_js
 
 node_js:
-- '6.9.1'
+- '6.10.1'
 
 cache:
     directories:

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>

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>

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);

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",

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": {

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": {

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.",

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:

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;
         });