60306 Commits

Author SHA1 Message Date
Petr Škoda
50f743021e MDL-39028 fix sqlsrv concat type conversion 2013-04-08 13:17:56 +02:00
Dan Poltawski
422f68fb86 Moodle release 2.5beta v2.5.0-beta 2013-04-05 18:03:30 +08:00
Dan Poltawski
1a90b9b6dc fix permissions 2013-04-05 17:56:05 +08:00
Dan Poltawski
0676f20581 ie9 svg compatibility fixes 2013-04-05 17:55:06 +08:00
Dan Poltawski
203a2538d6 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-04-05 17:52:13 +08:00
Damyon Wiese
eafa0ba46a Merge branch 'MDL-35073_master' of https://github.com/markn86/moodle 2013-04-05 17:39:13 +08:00
Mark Nelson
c517765430 MDL-35073 badges: passed the session key in the enable access URL 2013-04-05 17:10:43 +08:00
Damyon Wiese
8806e79a14 Merge branch 'openbadges-fixes' of https://github.com/danpoltawski/moodle 2013-04-05 17:10:14 +08:00
Dan Poltawski
8b8641876b Merge branch 'MDL-36804-fix3' of git://github.com/damyon/moodle 2013-04-05 16:43:43 +08:00
Damyon Wiese
9f014461db MDL-36804 Assign attempt history: Submit button missing 2013-04-05 16:40:16 +08:00
Dan Poltawski
31f2822a5e Merge branch 'MDL-36804-master-fix2' of git://github.com/damyon/moodle 2013-04-05 16:00:35 +08:00
Damyon Wiese
e7af192606 MDL-36804 Assign history: Fix automatic coding error when using auto-reopen method
This fix should call the gradebook function is_passed - but the gradebook is returning a record with
not enough information to create an instance of grade_grade.
2013-04-05 15:53:38 +08:00
Dan Poltawski
2916ca61be MDL-35073 badges: fix incorrect fk name
Good spotting Damyon!
2013-04-05 15:47:15 +08:00
Dan Poltawski
bdc518b507 MDL-35073 badges: fix duplicate indexes 2013-04-05 15:27:32 +08:00
Dan Poltawski
c39896e85d Revert "MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets"
This reverts commit fe104762c9acb0e178ae1d5ffe514c8109f48f0a.
2013-04-05 14:34:07 +08:00
Damyon Wiese
a8fdb36cf2 MDL-36804 Assignment attempt history: Fix warning on saving a new grade.
This is a fix for the case when there is a submission but no grade.
2013-04-05 10:03:00 +08:00
Eloy Lafuente (stronk7)
577173a51f Merge branch 'MDL-38897-master' of git://github.com/danpoltawski/moodle 2013-04-05 03:21:52 +02:00
Damyon Wiese
6aa38ef89a Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle 2013-04-05 09:19:09 +08:00
Eloy Lafuente (stronk7)
6481aafbb8 MDL-38852 repository_recent: add missing type. 2013-04-05 03:06:15 +02:00
Eloy Lafuente (stronk7)
c5f4080a10 Merge branch 'MDL-38852-master' of git://github.com/danpoltawski/moodle 2013-04-05 02:51:48 +02:00
Eloy Lafuente (stronk7)
dbc5692fc5 Merge branch 'MDL-38883-master' of git://github.com/danpoltawski/moodle 2013-04-05 02:48:37 +02:00
Eloy Lafuente (stronk7)
8f3885f23d Merge branch 'MDL-38886-master' of git://github.com/danpoltawski/moodle 2013-04-05 02:46:15 +02:00
Marina Glancy
97d5e39c49 MDL-38708 Changed test to be more accurate 2013-04-05 10:52:09 +11:00
Andrew Robert Nicols
b0fb4c12d7 MDL-38667 JavaScript: Don't use -min files for YUI CSS 2013-04-04 17:18:56 +02:00
Eloy Lafuente (stronk7)
c001c51a26 Merge branch 'MDL-36570' of git://github.com/colchambers/moodle 2013-04-04 16:59:34 +02:00
Tim Hunt
c7fbfe46f9 MDL-38538 question autosave: fix sequencecheck handling. 2013-04-04 15:32:32 +01:00
Colin Chambers
11a66e2c5a MDL-36570 Grouped question type answer fields now display errors 2013-04-04 15:29:39 +01:00
Tim Hunt
e3485c5f75 MDL-38538 quiz autosave: fix JavaScript errors.
1. Make cancelling the delay more robust.
2. Ignore changes in flag state. They are already saved using AJAX.
3. Typo that caused an error when there was no TinyMCE on the page.
2013-04-04 12:32:54 +01:00
Tim Hunt
aa81e35847 MDL-38209 quiz css: fix minor regression. 2013-04-04 11:17:39 +01:00
Colin Chambers
c3f21ec516 MDL-36570 Added missing calculatedmulti fields 2013-04-04 11:17:33 +01:00
Dan Poltawski
83e353fae9 MDL-38886 course: missing setType calls when adding a new category 2013-04-04 17:22:28 +08:00
Dan Poltawski
d60ee78a5f MDL-38883 calendar: fix missing setType
Also remove duplicate sesskey definition (this is done by formslib
internally)
2013-04-04 17:17:37 +08:00
Aparup Banerjee
37240ce5c6 Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle
Conflicts:
	version.php
2013-04-04 15:07:01 +08:00
Dan Poltawski
b7d20148a1 MDL-38897 formslib: add unit tests for setType debugging 2013-04-04 14:59:21 +08:00
Dan Poltawski
48056d5459 MDL-38885 - don't test for setType in display() itself
Doing it in _process_submission is enough.
2013-04-04 14:58:14 +08:00
Damyon Wiese
6ed18a6828 Merge branch 'MDL-38633' of git://github.com/stronk7/moodle 2013-04-04 14:26:15 +08:00
Dan Poltawski
589fe9c85d Merge branch 'MDL-38590_master-fix-behat' of git://github.com/dmonllao/moodle 2013-04-04 14:05:17 +08:00
David Monllao
b0f0995b09 MDL-38590 behat: Fixing broken behat test 2013-04-04 13:54:40 +08:00
David Monllao
b82e0c17fb MDL-38691 behat: Fixing behat tests 2013-04-04 13:52:24 +08:00
Damyon Wiese
57bc1beb1b MDL-37009 Course - Fix typo in new lang string. 2013-04-04 11:24:13 +08:00
Damyon Wiese
200571507f Merge branch 'wip-MDL-37009-master' of git://github.com/marinaglancy/moodle 2013-04-04 11:22:20 +08:00
Dan Poltawski
f88ff0e7cf Merge branch 'MDL-38861' of git://github.com/stronk7/moodle 2013-04-04 11:00:01 +08:00
Damyon Wiese
1b774df9a7 MDL-35073 Open badges - close session before making curl request to check backpack server. 2013-04-04 10:39:51 +08:00
Damyon Wiese
b38f932abf Merge branch 'MDL-38823_master-fix' of git://github.com/dmonllao/moodle 2013-04-04 10:34:50 +08:00
AMOS bot
a2c27c823a Automatically generated installer lang files 2013-04-04 00:36:08 +00:00
Eloy Lafuente (stronk7)
0c7ad0ab13 Merge branch 'MDL-38612-master-int' of git://github.com/FMCorz/moodle 2013-04-04 01:15:34 +02:00
Eloy Lafuente (stronk7)
1b882ab87b Merge branch 'MDL-38590-master-int' of git://github.com/FMCorz/moodle 2013-04-04 01:14:36 +02:00
Eloy Lafuente (stronk7)
33871fbf3e Merge branch 'MDL-38751-master' of git://github.com/FMCorz/moodle 2013-04-04 01:07:23 +02:00
Eloy Lafuente (stronk7)
5c98b64b00 Merge branch 'MDL-38666-m' of git://github.com/andrewnicols/moodle 2013-04-04 01:04:00 +02:00
Eloy Lafuente (stronk7)
235fc2562c Merge branch 'MDL-38667-m' of git://github.com/andrewnicols/moodle 2013-04-04 01:02:20 +02:00