Merge branch 'MDL-44846-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Apr 2014 20:48:50 +0000 (08:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Apr 2014 20:48:50 +0000 (08:48 +1200)
lib/editor/atto/lang/en/editor_atto.php
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js
lib/editor/atto/plugins/image/yui/src/button/js/button.js
mod/assign/tests/behat/prevent_submission_changes.feature
version.php

index 410711d..c77afe5 100644 (file)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['errorcannotparseline'] = 'The line \'{$a}\' could not be parsed.';
-$string['errorgroupisusedtwice'] = 'The group \'{$a}\' is defined twice, group names must be unique.';
-$string['errornopluginsorgroupsfound'] = 'No plugins or groups found, please add some groups and plugins.';
-$string['errorpluginnotfound'] = 'The plugin \'{$a}\' cannot be used, it does not appear to be installed.';
-$string['errorpluginisusedtwice'] = 'The plugin \'{$a}\' is used twice, plugins can only be defined once.';
+$string['errorcannotparseline'] = 'The line \'{$a}\' is not in the correct format.';
+$string['errorgroupisusedtwice'] = 'The group \'{$a}\' is defined twice; group names must be unique.';
+$string['errornopluginsorgroupsfound'] = 'No plugins or groups found; please add some groups and plugins.';
+$string['errorpluginnotfound'] = 'The plugin \'{$a}\' cannot be used; it does not appear to be installed.';
+$string['errorpluginisusedtwice'] = 'The plugin \'{$a}\' is used twice; plugins can only be defined once.';
 $string['pluginname'] = 'Atto HTML editor';
 $string['subplugintype_atto'] = 'Atto plugin';
 $string['subplugintype_atto_plural'] = 'Atto plugins';
index 3fb7392..0dd910f 100644 (file)
Binary files a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js and b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js differ
index 2668335..fbb7a71 100644 (file)
Binary files a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js and b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js differ
index 3fb7392..0dd910f 100644 (file)
Binary files a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js and b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js differ
index 77c7991..873caf3 100644 (file)
@@ -409,8 +409,8 @@ Y.namespace('M.atto_image').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             input.set('value', params.url);
 
             // Auto set the width and height.
-            self._form.one('.' + CSS.INPUTWIDTH).set('value', '');
-            self._form.one('.' + CSS.INPUTHEIGHT).set('value', '');
+            this._form.one('.' + CSS.INPUTWIDTH).set('value', '');
+            this._form.one('.' + CSS.INPUTHEIGHT).set('value', '');
 
             // Load the preview image.
             this._loadPreviewImage(params.url);
index 5a39f63..65cd547 100644 (file)
@@ -42,7 +42,7 @@ Feature: Prevent or allow assignment submission changes
     And I follow "Course 1"
     And I follow "Test assignment name"
     When I follow "View/grade all submissions"
-    And I click on "//tr[contains(., 'Student 1')]/descendant::td/descendant::img[@alt='Actions']/parent::a" "xpath_element"
+    And I click on "Edit" "link" in the "Student 1" "table_row"
     And I follow "Prevent submission changes"
     Then I should see "Submission changes not allowed"
     And I log out
@@ -56,7 +56,7 @@ Feature: Prevent or allow assignment submission changes
     And I follow "Course 1"
     And I follow "Test assignment name"
     And I follow "View/grade all submissions"
-    And I click on "//tr[contains(., 'Student 1')]/descendant::td/descendant::img[@alt='Actions']/parent::a" "xpath_element"
+    And I click on "Edit" "link" in the "Student 1" "table_row"
     And I follow "Allow submission changes"
     And I should not see "Submission changes not allowed"
     And I log out
index fc75793..b8d718a 100644 (file)
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2014032700.02;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2014040300.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
 
-$release  = '2.7dev (Build: 20140327)'; // Human-friendly version name
+$release  = '2.7dev (Build: 20140403)'; // Human-friendly version name
 
 $branch   = '27';                       // This version's branch.
 $maturity = MATURITY_ALPHA;             // This version's maturity level.