15138 Commits

Author SHA1 Message Date
Sam Hemelryk
e0d9b7c0d4 MDL-37683 cache: siteidentifier is now included in the keys 2013-02-18 08:32:03 +13:00
Eloy Lafuente (stronk7)
7fe9a7863a Merge branch 'MDL-37787_master' of git://github.com/dmonllao/moodle 2013-02-12 10:07:58 +01:00
Dan Poltawski
5c70d6505a Merge branch 'MDL-37768_master' of git://github.com/dmonllao/moodle 2013-02-12 15:44:17 +08:00
Damyon Wiese
147f592742 Merge branch 'MDL-37873_master' of git://github.com/dmonllao/moodle
Conflicts:
	course/tests/behat/add_activities.feature
2013-02-12 14:48:40 +08:00
Damyon Wiese
2262c52122 Merge branch 'MDL-37012-master' of git://github.com/mouneyrac/moodle 2013-02-12 14:39:20 +08:00
Dan Poltawski
008a6514ae Merge branch 'MDL-37952' of git://github.com/stronk7/moodle 2013-02-12 09:45:38 +08:00
Eloy Lafuente (stronk7)
e8e6802225 Merge branch 'MDL-37943' of git://github.com/timhunt/moodle 2013-02-12 01:20:56 +01:00
Eloy Lafuente (stronk7)
625d5f8164 Merge branch 'MDL-37896' of git://github.com/timhunt/moodle 2013-02-12 01:13:18 +01:00
Eloy Lafuente (stronk7)
ef1a4d20d4 Merge branch 'MDL-37919-phpunit-exception' of git://github.com/mudrd8mz/moodle 2013-02-12 01:07:43 +01:00
Eloy Lafuente (stronk7)
e196517bf5 Merge branch 'wip-MDL-35832-master' of git://github.com/phalacee/moodle 2013-02-11 23:31:38 +01:00
Dan Poltawski
32f832b22b Merge branch 'master_MDL-35332' of git://github.com/totara/moodle 2013-02-11 16:43:34 +08:00
Simon Coggins
5c4ffeb883 MDL-35332: Use fast hash when generating hashes during tests 2013-02-11 21:38:07 +13:00
Damyon Wiese
a052fe8a6b MDL-37122 core get_max_upload_sizes: Removed unit test for no limit as it is depends on settings in php.ini 2013-02-11 15:18:12 +08:00
Damyon Wiese
1e7db9fee8 Merge branch 'master_MDL-35332' of git://github.com/totara/moodle
Conflicts:
	lib/tests/moodlelib_test.php
	version.php
2013-02-11 14:51:11 +08:00
Dan Poltawski
2ae00d0d3c Merge branch 'MDL-37122-master' of git://github.com/damyon/moodle 2013-02-11 14:24:04 +08:00
Dan Poltawski
acd561c66a Merge branch 'MDL-37797' of git://github.com/rwijaya/moodle 2013-02-11 13:58:36 +08:00
Andrew Davis
c90e6b4644 MDL-36091 added debugging() calls in blocks of code marked as "should never happen" 2013-02-11 13:24:52 +08:00
Dan Poltawski
a614fb7457 Merge branch 'MDL-35819-m' of git://github.com/andrewnicols/moodle 2013-02-11 10:56:07 +08:00
Damyon Wiese
8dcca4aacb MDL-30637 Formslib - Cleanup for shortforms implementation (mostly comments)
Also added deprecated functions for the functions that were removed from MoodleQuickForm.
2013-02-11 10:37:13 +08:00
Damyon Wiese
40f1c065b4 Merge branch 'MDL-30637-master' of git://github.com/lucisgit/moodle 2013-02-11 10:37:03 +08:00
Andrew Robert Nicols
238b8bc9b6 MDL-35819 AJAX Rewrite Moodle popup help to be more friendly and more efficient 2013-02-10 11:50:56 +00:00
Eloy Lafuente (stronk7)
82b61ff8a5 MDL-37952 make helper descendants abstract 2013-02-09 16:22:06 +01:00
Simon Coggins
ec2d8ceb88 MDL-35332 lib: Improve security of hashed passwords 2013-02-09 06:47:57 +13:00
Tim Hunt
2d2018abda MDL-37896 qtype_essay: correct PARAM_CLEANHTML -> PARAM_RAW.
It turns out that you should almost never use PARAM_CLEANHTML.
2013-02-08 12:51:21 +00:00
Tim Hunt
1fa845437c MDL-37943 upgrade: logic error in upgrade_plugins_blocks.
Derek Woolhead tracked down the problem and what needed to be fixed. I
just made the patch.

The problem was that if $plugin->cron had changed in version.php, then
the version number in the database could end up wrong after the upgrade,
and so the upgrade would immediately run a second time.
2013-02-08 12:40:49 +00:00
David Monllao
68fae082df MDL-37787 behat: Using progress format by default 2013-02-08 17:14:57 +08:00
David Monllao
b831d47925 MDL-37768 behat: Checking test site version before running tests 2013-02-08 17:14:26 +08:00
David Monllao
9776ddeee2 MDL-37873 behat: Fixing CSS-based assertions arguments 2013-02-08 17:13:32 +08:00
David Monllao
1f9ffbdbde MDL-37750 behat: Using base find* methods 2013-02-08 17:11:27 +08:00
David Monllao
d56ae59b47 MDL-37750 behat: Waiting for DOM ready 2013-02-08 17:11:27 +08:00
David Monllao
ff48a235a9 MDL-37750 behat: Elements finders at base level
Set of DOM elements finders to
avoid false fails.
2013-02-08 17:11:27 +08:00
David Mudrák
8d37c9b2d9 MDL-37919 Let PHPUnit display the content of $a even if the error string is not found 2013-02-08 01:25:31 +01:00
Ruslan Kabalin
ac5e6ca4d1 MDL-30637 Refactor Advanced fileds functionality
The displaying of advanced items has been refactored. The changes are:

* The Advanced button is replaced by the Show Less/More link
* The Show less/more link controls advanced elements only within the section
  it is located at
* The Show less/more state of sections is preserved between form submissions
* When javascript is off, all advanced elements will be displayed by default,
  no show/hide controls will exists on the page
2013-02-07 14:38:37 +00:00
Ruslan Kabalin
a4067bfc48 MDL-30637 Simplify moodle forms
Make the forms easier to use and navigate by adding functionality to
collapse and extend form sections (headers). The logic is as follows:

If form contains 2 and less sections (headers):

* Display the form as non-collapsible at all.
* The point above can be overridden if developer marks the section as expanded
  in form definition (e.g. $mform->setExpanded('foo'));

If form contains 3 and more sections (headers):

* always expanding the first section and closing all others by default;
* always expanding a section containing at least one "required" element;
* expanding any section which contains validation errors after submission;
* expanding any section which was previously open on previous submit (e.g. when
  adding new choices);
* expanding the section which is marked as expanded in form definition (e.g.
  $mform->setExpanded('foo');
2013-02-07 14:13:36 +00:00
Damyon Wiese
6b219310cf MDL-37122 core get_max_upload_sizes: Include "Course/Site/Activity limit (X)" in list of options
This change removes the "0 bytes" option from the get_max_upload_sizes list
and replaces it with "Course limit (X)" or "Site limit (X)" (whichever is smaller).
This means we can remove all custom handling in the modules that were removing and
adding these options. It only affects pages that pass valid options for sitelimit and
courselimit - so admin pages will work correctly.

It also orders the list so the course/site limit options will be first
(as it will be the largest).

AMOS START
 REM [courseuploadlimit, core] has been parameterized to get [uploadlimitwithsize, core]
AMOS END
2013-02-07 10:50:52 +08:00
Marina Glancy
8fd56c1942 MDL-37572 correct active navigation node for add/edit category page 2013-02-07 15:22:29 +13:00
Andrew Robert Nicols
c5f609428d MDL-37566 AJAX Fix issues with minimum height and centring 2013-02-06 10:51:40 +00:00
Dan Poltawski
8c8d314ffd Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle 2013-02-06 14:21:03 +08:00
Jason Fowler
083c15e640 MDL-35823 - Accessibility - Readding Focus to header in the help popup 2013-02-06 14:17:29 +08:00
Eloy Lafuente (stronk7)
5ab0371d74 Merge branch 'MDL-37854_master' of https://github.com/markn86/moodle 2013-02-05 11:10:48 +01:00
Mark Nelson
17222a4a25 MDL-37854 phpunit: replaced occurrence of non-existent function assertFail 2013-02-05 18:03:25 +08:00
Jerome Mouneyrac
b4d24344c2 MDL-37012 some typos, add a new lang string, change tag 'a' for 'link', some code cleaning,
clean the external string against cross-scripting, proper usage of doclink,
correcting the require_once quickform/input

AMOS BEGIN
    CPY [download,block_community],[install,block_community]
AMOS END
2013-02-05 16:36:37 +08:00
Howard Miller
540b8834fa MDL-37797 HTML block: add contextid to block_positions query and make it more unique. 2013-02-05 16:20:34 +08:00
Damyon Wiese
33d943500f Merge branch 'wip-mdl-30062' of git://github.com/rajeshtaneja/moodle 2013-02-05 15:53:21 +08:00
Dan Poltawski
9cf44c32b5 Merge branch 'wip-MDL-37572-m25' of git://github.com/samhemelryk/moodle 2013-02-05 15:25:08 +08:00
Rajesh Taneja
791723c34a MDL-30062 Webservices: added update_course webservice 2013-02-05 14:15:53 +08:00
Damyon Wiese
4c5dc0e367 MDL-36206 Unit tests - Cleanup whitespace issues from previous patch 2013-02-05 14:11:11 +08:00
Damyon Wiese
9d6f6a6987 Merge branch 'wip-MDL-36206-master' of git://github.com/phalacee/moodle 2013-02-05 14:11:07 +08:00
Damyon Wiese
183e656eea Merge branch 'MDL-30102_master' of git://github.com/markn86/moodle 2013-02-05 11:23:01 +08:00
Dan Poltawski
ba076613d3 Merge branch 'MDL-36986' of git://github.com/moodlerooms/moodle 2013-02-05 10:47:15 +08:00