53018 Commits

Author SHA1 Message Date
Dan Marsden
b4b1d49044 MDL-31731 Advanced Grading: Marking Guide: fix bug with check to display warning about discrepency between module maxgrade and number of marks in Marking Guide. 2012-05-04 09:12:29 +12:00
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
Andrew Robert Nicols
5bd03e12fa MDL-32743 Set resource anchor correctly following course ajax changes 2012-05-03 16:25:56 +01:00
Petr Skoda
3690955e65 MDL-32680 import latest TinyMCE 3.5 2012-05-03 15:49:23 +02:00
Andrew Robert Nicols
178f351480 MDL-32745 Don't apply course ajax to site_main_menu block 2012-05-03 14:27:43 +01: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
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
Aparup Banerjee
b21a1d4086 Merge branch 'wip-MDL-32416-master' of git://github.com/marinaglancy/moodle 2012-05-03 11:33:55 +08:00
Marina Glancy
169709383a MDL-32416: Picasa repository now returns path, also fixed album title retrieval 2012-05-03 11:30:08 +08:00
AMOS bot
d3e43d13a9 Automatically generated installer lang files 2012-05-03 00:31:27 +00:00
Eloy Lafuente (stronk7)
03764014af MDL-32234 Library: usergetdate tests moved to assertSame()
(to check both type and value)
2012-05-03 00:52:25 +02:00
Eloy Lafuente (stronk7)
150166d371 Merge branch 'wip-mdl-32234' of git://github.com/rajeshtaneja/moodle 2012-05-03 00:35:34 +02:00
Ruslan Kabalin
0872ee1dd0 MDL-32717: Fix strict standards warning on uninstall 2012-05-02 11:58:37 +01:00
Dan Poltawski
307621dfce Merge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/moodle 2012-05-02 18:01:40 +08:00
David Mudrak
f08c15685b MDL-32638 fixing the area names and file_browser::get_file_info() API call
These two bug made the file browsing non-working in workshop 2.x
2012-05-02 11:39:30 +02:00
Dan Poltawski
0c38671095 Merge branch 'MDL-32657-master-2' of git://git.luns.net.uk/moodle 2012-05-02 16:54:54 +08:00
Ruslan Kabalin
d95b77bdb7 MDL-32657: Add format.js for topics format and remove default
Using topics format as default is not a great idea, as we can end up
half-working dragdrop for some formats. With the current soiution, drag-drop
will not work for format, unless required js functions have been created in
format.js
2012-05-02 09:42:06 +01:00
Tim Hunt
9ab9f9feb7 MDL-32721 quiz: missing message provider lang string from MDL-3030 2012-05-02 08:19:10 +01:00
Aparup Banerjee
648baa788c Merge branch 'MDL-28657-master' of https://github.com/mackensen/moodle 2012-05-02 13:55:39 +08:00
Sam Hemelryk
ab45e3b491 Merge branch 'MDL-31762' of git://github.com/mouneyrac/moodle 2012-05-02 17:52:13 +12:00
Sam Hemelryk
1470c0f46e Merge branch 'MDL-26275_large_grader' of git://github.com/andyjdavis/moodle 2012-05-02 17:44:35 +12:00
Sam Hemelryk
398e6932b0 Merge branch 'MDL-32657-master-1' of git://git.luns.net.uk/moodle 2012-05-02 14:41:11 +12:00
Mary Evans
c6e8b3b235 MDL-32684 lib/pagelib: adds break; statements to theme order in lib/pagelib.php 2012-05-02 01:20:04 +01:00
Sam Hemelryk
fe9693df87 Merge branch 'w18_MDL-26028_m23_xsendfile' of git://github.com/skodak/moodle 2012-05-02 11:48:24 +12:00
Sam Hemelryk
a6d2cf82dc Merge branch 'w18_MDL-32595_m23_unsignedandlob' of git://github.com/skodak/moodle 2012-05-02 10:25:09 +12:00
Petr Skoda
a090587234 MDL-32697 improve MySQL and Oracle test reset performance 2012-05-01 14:35:23 +02:00
Davo Smith
d50e8a1bda MDL-32698 Question - Fixed typos in load_question_attempt 2012-05-01 10:17:08 +01:00
Andrew Robert Nicols
19d041bf2b MDL-32681 Only add drag/drop icons if moveup/movedown icons are present 2012-05-01 09:52:46 +01:00
Juan Leyva
63a85dc7a3 MDL-13130 webservices: Implementation of core_course_delete_courses 2012-05-01 15:23:50 +08:00
Dan Poltawski
1cba46c793 MDL-32693 webservice: fix typo in URL 2012-05-01 12:27:43 +08:00
Andrew Davis
1e2698f6fa MDL-26275 grade: made some equality checks more strict and added some explanatory comments 2012-05-01 10:43:09 +07:00
Dan Poltawski
6b445cb17a Merge branch 'w18_MDL-30686_m23_guessurl' of git://github.com/skodak/moodle 2012-05-01 11:27:16 +08:00