sam marshall
|
db0f0097e8
|
MDL-42084 Unit tests: Remove unnecessary 'clear time limit change' lines
|
2013-11-06 16:40:04 +00:00 |
|
sam marshall
|
3ef7279f26
|
MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere
Exceptions (places where set_time_limit is still left) are:
Third-party libraries:
ADODB
PHPMailer
Moodle core:
PHPUnit - not relevant (CLI mode)
|
2013-11-06 16:40:01 +00:00 |
|
Marina Glancy
|
bdb7c88635
|
Merge branch 'MDL-42031-master' of git://github.com/mouneyrac/moodle
Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
|
2013-11-06 17:18:38 +11:00 |
|
Jerome Mouneyrac
|
d40ce26f05
|
MDL-42031 assginfeedback_editpdf: fix next/previous/select page
|
2013-11-06 14:13:19 +08:00 |
|
Colin Campbell
|
6d2baaaea4
|
MDL-42640 quiz: Fix restore of backup without overduehandling setting
Use default quiz overduehandling setting when restoring a
backup from older Moodle version that does not have a quiz
overduehandling setting.
|
2013-11-06 16:32:15 +11:00 |
|
Damyon Wiese
|
951b414b65
|
Merge branch 'MDL-40975-master' of git://github.com/andrewnicols/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
|
2013-11-06 13:06:01 +08:00 |
|
Marina Glancy
|
c32ba4e2fb
|
Merge branch '42690-26' of git://github.com/samhemelryk/moodle
|
2013-11-06 15:52:03 +11:00 |
|
David Monllao
|
047a8800f4
|
MDL-40975 course: Adapt behat tests to the new course editing interface
|
2013-11-06 11:41:00 +08:00 |
|
Mary Evans
|
fe4848110a
|
MDL-40244 forms: added setType() for groupinfo in forum and wiki
|
2013-11-06 12:23:18 +11:00 |
|
Marina Glancy
|
a43db075ff
|
Merge branch 'MDL-42402-master-fix3' of git://github.com/damyon/moodle
|
2013-11-06 11:52:15 +11:00 |
|
Damyon Wiese
|
cb35482abf
|
MDL-42402 EditPDF: CSS fix for hover on drop down menus
Also required a fix for the comment search window because it was picking up the same styles.
|
2013-11-06 00:41:04 +08:00 |
|
Damyon Wiese
|
237f484188
|
MDL-42671 EditPDF: Disable EditPDF is zlib is not available
Also put a warning on the admin page if this is the case.
|
2013-11-06 00:26:05 +08:00 |
|
Dan Poltawski
|
e957dfa549
|
Merge branch 'MDL-42402-master-fix2' of git://github.com/damyon/moodle
|
2013-11-05 15:06:36 +08:00 |
|
Damyon Wiese
|
1d38083c9d
|
MDL-42402 EditPDF: Make the colours match the mockup in MDL-41633
|
2013-11-05 14:49:06 +08:00 |
|
Marina Glancy
|
edf21f0c56
|
Merge branch 'MDL-42706-master-int' of git://github.com/FMCorz/moodle
|
2013-11-05 17:13:38 +11:00 |
|
Frederic Massart
|
3ec7ea98a1
|
MDL-42706 mod_book: Undefined CFG in pluginfile function
|
2013-11-05 13:19:42 +08:00 |
|
Damyon Wiese
|
057a79922e
|
Merge branch 'MDL-42701' of git://github.com/stronk7/moodle
|
2013-11-05 13:10:52 +08:00 |
|
Damyon Wiese
|
6655b6102a
|
MDL-42402 EditPDF: Fix the styles again
More fixes for the vertical alignment of the images in the toolbar buttons and the dropdowns.
|
2013-11-05 10:30:11 +08:00 |
|
Andrew Nicols
|
4816e19a6f
|
MDL-42464 mod_chat: Correct use of amp; in session link
|
2013-11-05 09:50:33 +08:00 |
|
Eloy Lafuente (stronk7)
|
f39c82ebed
|
MDL-42701 Bump all versions near 2.6 release
|
2013-11-05 02:36:00 +01:00 |
|
Dan Poltawski
|
5e70fc1f9c
|
Merge branch 'MDL-42548' of git://github.com/timhunt/moodle
|
2013-11-04 22:34:27 +08:00 |
|
Dan Poltawski
|
efe938fca5
|
Merge branch 'MDL-42464-master' of git://github.com/andrewnicols/moodle
|
2013-11-04 22:31:55 +08:00 |
|
Dan Poltawski
|
4a17894ac5
|
Merge branch 'MDL-42592_master' of https://github.com/markn86/moodle
|
2013-11-04 22:27:49 +08:00 |
|
Dan Poltawski
|
6db9f41419
|
Merge branch 'MDL-42355_editpdf_deselect_comment' of git://github.com/davosmith/moodle
Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
|
2013-11-04 20:10:24 +08:00 |
|
Dan Poltawski
|
22379484fd
|
Merge branch 'wip-mdl-41849' of https://github.com/rajeshtaneja/moodle
|
2013-11-04 19:35:01 +08:00 |
|
Dan Poltawski
|
81da82f5f3
|
Merge branch '42350-26' of git://github.com/samhemelryk/moodle
|
2013-11-04 17:21:29 +08:00 |
|
Rajesh Taneja
|
5540b2caf3
|
MDL-41849 Quiz: Quiz send mail from noreply user
Mails should be send by noreply user and not admin user
|
2013-11-04 16:29:55 +08:00 |
|
Marina Glancy
|
8be0ca758c
|
Merge branch 'MDL-42604-master' of git://github.com/ankitagarwal/moodle
|
2013-11-04 19:16:23 +11:00 |
|
Sam Hemelryk
|
19195b602c
|
MDL-42690 mod_assign: remove submit button from single grading interface
|
2013-11-04 16:02:43 +08:00 |
|
Ankit Agarwal
|
e5eff0b626
|
MDL-42287 behat: Use string from scorm content, instead of scorm structure
|
2013-11-04 15:52:42 +08:00 |
|
Damyon Wiese
|
2bd27878db
|
MDL-42350 assign: Test group submission + drafts
|
2013-11-04 15:50:26 +08:00 |
|
Sam Hemelryk
|
7a47babb9e
|
MDL-42350 mod_assign: fixed display of submission button
|
2013-11-04 15:50:25 +08:00 |
|
Dan Poltawski
|
b763a03ddb
|
Merge branch 'MDL-42494-workshop-exception' of git://github.com/mudrd8mz/moodle
|
2013-11-04 14:51:16 +08:00 |
|
Marina Glancy
|
23f13c5304
|
Merge branch 'MDL-42429_master' of https://github.com/markn86/moodle
|
2013-11-04 17:27:57 +11:00 |
|
Sam Hemelryk
|
8e23283cbb
|
Merge branch 'wip-MDL-42577-master' of git://github.com/marinaglancy/moodle
|
2013-11-04 14:24:46 +08:00 |
|
Marina Glancy
|
197ab6efef
|
Merge branch 'MDL-42566_master' of https://github.com/markn86/moodle
|
2013-11-04 17:22:45 +11:00 |
|
Damyon Wiese
|
d04bea30da
|
Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle
|
2013-11-04 13:11:42 +08:00 |
|
Marina Glancy
|
78d877d40b
|
Merge branch 'MDL-42402-master' of git://github.com/damyon/moodle
|
2013-11-04 15:53:22 +11:00 |
|
Marina Glancy
|
feb09881fb
|
Merge branch 'MDL-38664' of git://github.com/rwijaya/moodle
|
2013-11-04 15:13:42 +11:00 |
|
Damyon Wiese
|
42fb49ae0b
|
Merge branch 'MDL-35146_master' of https://github.com/markn86/moodle
|
2013-11-04 11:53:40 +08:00 |
|
Tim Hunt
|
78a492330d
|
MDL-41820 XSS in the quiz responses report.
Thanks to Michael Hess for finding this bug and reporting it to us.
|
2013-11-04 11:12:42 +08:00 |
|
Damyon Wiese
|
f859f6b4e6
|
Merge branch 'MDL-42521_master' of git://github.com/grabs/moodle
|
2013-11-04 10:56:12 +08:00 |
|
Damyon Wiese
|
0d0b93ce2f
|
Merge branch 'MDL-42663_master' of git://github.com/dmonllao/moodle
|
2013-11-04 10:49:06 +08:00 |
|
Damyon Wiese
|
23cd687d72
|
Merge branch 'MDL-38850' of git://github.com/rwijaya/moodle
|
2013-11-04 09:38:38 +08:00 |
|
Andreas Grabs
|
73bbdce8c6
|
MDL-42521 mod_feedback - Feedback does not show line graphs in Clean theme
|
2013-11-03 19:11:27 +01:00 |
|
Damyon Wiese
|
e0c14e5018
|
Merge branch 'w45_MDL-42387_m26_filelifetime' of https://github.com/skodak/moodle
|
2013-11-02 22:24:19 +08:00 |
|
Petr Škoda
|
0c431257e9
|
MDL-42387 standardise file lifetime handling
|
2013-11-01 10:42:18 +01:00 |
|
Dan Poltawski
|
54173d4180
|
Merge branch 'MDL-42287-master' of git://github.com/ankitagarwal/moodle
|
2013-11-01 17:31:17 +08:00 |
|
David Monllao
|
92bfad6b1b
|
MDL-42663 mod_lesson: Move definitions to show_clock()
Seems that the required data is not always set
before timer.js is included.
|
2013-11-01 16:37:45 +08:00 |
|
Mark Nelson
|
66dbecef8a
|
MDL-42429 mod_lesson: removed unnecessary conditional check causing a PHP notice
|
2013-11-01 16:22:49 +08:00 |
|