Commit graph

53309 commits

Author SHA1 Message Date
Tim Hunt
070511062a MDL-32757 / MDL-3030 quiz: SQL typo breaks quiz editing. 2012-05-03 19:45:18 +01:00
Dan Poltawski
e50de8764b Merge branch 'MDL-32738' of git://github.com/timhunt/moodle 2012-05-04 01:09:53 +08:00
Tim Hunt
f59f85717e MDL-32738 quiz overdue handling cron: appease MySQL.
Thanks to sam marshall for giving my the idea of using a subquery to
make the SQL work on all DBs.
2012-05-03 18:07:59 +01:00
Dan Poltawski
59e430718a Merge branch 'MDL-32740' of git://github.com/timhunt/moodle 2012-05-04 00:58:00 +08:00
Eloy Lafuente (stronk7)
97101a0397 Merge branch 'MDL-32693' of git://github.com/danpoltawski/moodle 2012-05-03 18:22:05 +02:00
Petr Skoda
3690955e65 MDL-32680 import latest TinyMCE 3.5 2012-05-03 15:49:23 +02:00
Dan Poltawski
f1e8e6adce Merge branch 'MDL-32739' of git://github.com/timhunt/moodle 2012-05-03 21:23:19 +08:00
Dan Poltawski
9b06d97381 Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle 2012-05-03 20:43:28 +08:00
Tim Hunt
96e5168c7e MDL-32740 / MDL-3030 quiz summary: no Return to attempt for overdue. 2012-05-03 12:16:43 +01:00
Tim Hunt
a558acf93f MDL-32739 quiz reports: process_actions broken. Regression from MDL-3030 2012-05-03 12:02:29 +01:00
Eloy Lafuente (stronk7)
f171c37dda Merge branch 'w18_MDL-32697_m23_oci' of git://github.com/skodak/moodle 2012-05-03 12:22:22 +02:00
Dan Marsden
e529ec8c09 MDL-31731 Grading form Marking Guide - fix for test 6.2, checkboxes not saving state when clearing both. 2012-05-03 22:12:34 +12:00
Dan Poltawski
1619a38b9b MDL-31270 pluginlib: Add assign subplugins as standard modules 2012-05-03 17:22:34 +08:00
Dan Poltawski
10ef48fc1e MDL-31270 mod_assign: now added to the standard plugin list 2012-05-03 17:13:09 +08:00
Petr Skoda
8d741d4dfc MDL-32697 use current database sequences instead of global scope
Credit goes to Eloy, thanks!
2012-05-03 10:52:19 +02:00
Dan Poltawski
e6236edebf MDL-31270 mod_assign: version dump
Introduce depdency from assignmentupgrade to mod_assign
2012-05-03 16:46:06 +08:00
Dan Poltawski
c06b2127bc MDL-31270 mod_assign: Fix another whitespace issue.
Seems I didn't catch them all :(
2012-05-03 16:46:06 +08:00
Aparup Banerjee
ed01233ace MDL-28134 General : added branch variable to version.php for reliable docs versioned links. 2012-05-03 16:30:20 +08:00
Dan Poltawski
08b5ac5aae Merge branch 'w18_MDL-32587_m23_phpunitindividual' of git://github.com/skodak/moodle 2012-05-03 16:11:00 +08:00
Dan Poltawski
1ca059ee88 MDL-31270 mod_assign: fix another whitespace issue 2012-05-03 16:10:16 +08:00
Dan Poltawski
9682626eec MDL-31270: mod_assign fix whitespace issues 2012-05-03 16:05:58 +08:00
Petr Skoda
62f9a5c4b6 MDL-32587 fix --buildcomponentconfigs compatibility with Windows 2012-05-03 09:34:35 +02:00
Damyon Wiese
bbd0e548c3 MDL-31270 mod_assign: introducing the assignment module
* Includes an assignment upgrade tool to convert from the old mod_assignment.
* Hides mod_assignment on new installs
2012-05-03 14:44:06 +08:00
Dan Poltawski
875f2e459e Merge branch 'wip-mdl-31498-default' of git://github.com/rajeshtaneja/moodle 2012-05-03 13:26:33 +08:00
Dan Poltawski
d5bf8f0ba3 Merge branch 'MDL-32689' of git://github.com/jrchamp/moodle 2012-05-03 13:10:56 +08:00
Andrew Davis
184ec2d68f MDL-31488 admin: made admin_externalpage_setup() try to guess the reason why the requested section couldnt be found 2012-05-09 11:58:02 +08:00
Dan Poltawski
96fdfb4486 Merge branch 'w19_MDL-32843_m23_yui351' of git://github.com/skodak/moodle 2012-05-09 11:24:40 +08:00
Dan Poltawski
bc5a657bfb MDL-32813 - fix trailing whitespace 2012-05-09 11:17:57 +08:00
Dan Poltawski
b7e4b76536 Merge branch 'MDL-32813' of github.com:netspotau/moodle-mod_assign 2012-05-09 11:13:09 +08:00
Dan Poltawski
096c68b585 Merge branch 'w19_MDL-32733_m23_authorizemessage' of git://github.com/skodak/moodle 2012-05-09 10:28:48 +08:00
Dan Poltawski
0f1513be80 Merge branch 'w19_MDL-32775_m23_searchpix' of git://github.com/skodak/moodle 2012-05-09 10:22:48 +08:00
Dan Poltawski
e5214ea13b Merge branch 'w19_MDL-32793_m23_iplookup' of git://github.com/skodak/moodle 2012-05-09 10:17:50 +08:00
Sam Hemelryk
86e62f9223 Merge branch 'wip-MDL-31147-master' of git://github.com/phalacee/moodle 2012-05-09 11:50:17 +12:00
Sam Hemelryk
303cb36b18 Merge branch 'wip-MDL-31948-master' of git://github.com/phalacee/moodle 2012-05-09 11:49:33 +12:00
Sam Hemelryk
a8f127950e Merge branch 'wip-MDL-31950-master' of git://github.com/phalacee/moodle 2012-05-09 11:49:23 +12:00
Sam Hemelryk
d779cd65a9 Merge branch 'wip-MDL-31952-master' of git://github.com/phalacee/moodle 2012-05-09 11:49:14 +12:00
Sam Hemelryk
b370716f7b Merge branch 'wip-MDL-31953-master' of git://github.com/phalacee/moodle 2012-05-09 11:48:35 +12:00
Sam Hemelryk
09d64cadee Merge branch 'MDL-32164-master-2' of git://git.luns.net.uk/moodle 2012-05-09 11:47:00 +12:00
Sam Hemelryk
55a8b2eefc Merge branch 'MDL-31940-master' of git://github.com/ankitagarwal/moodle 2012-05-09 11:43:27 +12:00
Sam Hemelryk
a6c1f5a4cc Merge branch 'MDL-31943-master' of git://github.com/ankitagarwal/moodle 2012-05-09 11:39:02 +12:00
Sam Hemelryk
d7e6345c11 Merge branch 'MDL-31945-master' of git://github.com/ankitagarwal/moodle 2012-05-09 11:37:29 +12:00
Sam Hemelryk
b1851f4639 Merge branch 'MDL-31946-master' of git://github.com/ankitagarwal/moodle 2012-05-09 11:35:38 +12:00
Sam Hemelryk
3803b4706a Merge branch 'MDL-18095-master-2' of git://git.luns.net.uk/moodle 2012-05-09 11:31:58 +12:00
Sam Hemelryk
70ebfcee6f Merge branch 'w19_MDL-32178_m23_dbenrolignore' of git://github.com/skodak/moodle 2012-05-09 11:17:39 +12:00
Sam Hemelryk
b11afed8cd Merge branch 'w19_MDL-32807_m23_navref' of git://github.com/skodak/moodle 2012-05-09 11:01:31 +12:00
Sam Hemelryk
b3c35188b0 MDL-32654 course-toolbox: Fixed up JS issue caused by incorrect selector 2012-05-09 10:55:17 +12:00
Sam Hemelryk
45d79572b5 Merge branch 'w19_MDL-32849_m23_urlrewriting' of git://github.com/skodak/moodle 2012-05-09 10:41:58 +12:00
Sam Hemelryk
9eb54eb4d7 Merge branch 'w19_MDL-32846_m23_syncyui2' of git://github.com/skodak/moodle 2012-05-09 10:27:46 +12:00
Petr Skoda
8c6136a879 MDL-32793 use geoLookup for IP address lookup by default 2012-05-08 23:45:28 +02:00
Sam Hemelryk
73002f1992 Merge branch 'MDL-32654-master-2' of git://git.luns.net.uk/moodle
Conflicts:
	course/yui/toolboxes/toolboxes.js
2012-05-09 09:32:01 +12:00