Commit graph

60382 commits

Author SHA1 Message Date
Damyon Wiese
5fbfc955d8 Merge branch 'MDL-39015-master' of git://github.com/danpoltawski/moodle 2013-04-08 12:32:56 +08:00
Dan Poltawski
fd0768c0e7 MDL-39015 navigation: remove course reports from navigation
Regression from the commit in
278065528a
2013-04-08 12:25:14 +08:00
Damyon Wiese
a6c215ab1f Merge branch 'MDL-38741-master' of git://github.com/danpoltawski/moodle 2013-04-08 12:00:52 +08:00
Dan Poltawski
bf48be3c7c Merge branch 'MDL-38634' of git://github.com/rlorenzo/moodle 2013-04-08 11:55:55 +08:00
Dan Poltawski
b23fcda2b9 Merge branch 'MDL-39006' of git://github.com/stronk7/moodle 2013-04-08 11:14:03 +08:00
Tim Lock
be47011d3c MDL-35868: quiz: Use correct attemptnumber when a last attempt exists. 2013-04-08 11:09:04 +08:00
Dan Poltawski
efc9febcd8 Merge branch 'wip-MDL-38701-m25' of git://github.com/marinaglancy/moodle 2013-04-08 10:22:59 +08:00
David Monllao
f9d3667e7b MDL-38179 behat: Step definition to click on a table row element 2013-04-08 10:07:21 +08:00
Marina Glancy
498e9a9a38 MDL-38701 Added missing require_once() before calling course_get_format 2013-04-08 11:34:05 +10:00
David Monllao
7b33327126 MDL-38878 behat: Also update composer dependencies after site install/reinstall 2013-04-08 09:03:04 +08:00
Marina Glancy
118ca9e96d MDL-34346 Cache retrieved repositories 2013-04-08 11:00:22 +10:00
Marina Glancy
cfb713519d MDL-34346 Correctly set repository current context 2013-04-08 11:00:22 +10:00
Rex Lorenzo
1207ae1a34 MDL-38634 folder: Problems displaying multiple folder resources inline in the course page 2013-04-07 17:28:24 -07:00
Petr Škoda
b1c5c4a887 MDL-38750 show errors at the end of OCI setup script
Credit goes to Damyon Wiese.
2013-04-07 19:44:46 +02:00
Eloy Lafuente (stronk7)
0fd23b76de MDL-39006 environment: raise all uses of 5.3.2 to 5.3.3 2013-04-07 18:32:15 +02:00
Petr Škoda
d958e6bd70 MDL-34222 import simplepie 1.3.1 2013-04-07 15:35:27 +02:00
Petr Škoda
b207e601f5 MDL-38786 import YUI 3.9.1 2013-04-06 19:08:09 +02:00
Tim Hunt
82081c1f7d MDL-38912 prevent time-outs during unit tests. 2013-04-05 18:37:25 +01:00
Eloy Lafuente (stronk7)
69ea3d7dd3 NOBUG: Bump to 2.5beta+
we don't package tagged commits in master, so let's
bump to beta+ and get the packaging done.
2013-04-05 14:29:54 +02:00
Dan Poltawski
422f68fb86 Moodle release 2.5beta 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
Paul Campbell
4f6c447be1 MDL-38766 wiki2.0: fix redirects
Signed-off-by: Paul Campbell <pcampbell@carnegiecollege.ac.uk>
2013-04-05 09:36:46 +01: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 fe104762c9.
2013-04-05 14:34:07 +08:00
Dan Poltawski
ebe558acb3 MDL-38744 completion: add missing setType and properly allow float
Now can use correct decimal seperator
2013-04-05 14:13:46 +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