Commit graph

14010 commits

Author SHA1 Message Date
Sam Hemelryk
bf0cdbcf8a Merge branch 'w24_MDL-32480_m26_imscp' of git://github.com/skodak/moodle 2013-06-10 14:41:21 +12:00
Sam Hemelryk
e559265c10 Merge branch 'wip-MDL-39227-master' of git://github.com/phalacee/moodle 2013-06-10 11:43:31 +12:00
Damyon Wiese
06b9df1145 MDL-37490 Assign: Minor patch cleanup
Bump version number for mod_assign
Remove use of global $OUTPUT (can use get_renderer() in assign)
Fix language strings
Add missing setTypes
2013-06-08 10:44:52 +01:00
Gareth J Barnard
ef8a6dfb33 MDL-37490 mod_assign: Add setting to show the due date on the course page. 2013-06-08 10:44:28 +01:00
Petr Škoda
f815e4cbdf MDL-32480 allow external https links in IMSCP too 2013-06-07 09:58:03 +02:00
Nicolas Dunand
4a04fef6ef MDL-32480 fix display of IMS content packages with external links 2013-06-07 09:58:03 +02:00
Dan Poltawski
984dc35457 Merge branch 'MDL-39939-scorm-basic-report-name' of git://github.com/mudrd8mz/moodle 2013-06-04 12:27:30 +08:00
Dan Poltawski
ea746c0166 Merge branch 'MDL-39317-master' of git://github.com/damyon/moodle 2013-06-04 11:26:28 +08:00
Dan Poltawski
0d9121a1c4 Merge branch 'MDL-39743-master' of git://github.com/damyon/moodle 2013-06-04 11:03:39 +08:00
Eloy Lafuente (stronk7)
422595e282 Merge branch 'MDL-39821-master' of git://github.com/damyon/moodle 2013-06-04 01:14:09 +02:00
Eloy Lafuente (stronk7)
71b2d24a9b Merge branch 'MDL-39932_master' of git://github.com/grabs/moodle 2013-06-03 19:10:00 +02:00
Eloy Lafuente (stronk7)
6cffc66647 Merge branch 'MDL-39487_master' of https://github.com/IOC/moodle 2013-06-03 19:03:15 +02:00
Tim Hunt
2ed7833790 MDL-39971 each attempt builds on last broken for previews. 2013-05-31 20:24:50 +01:00
Adam Olley
f985bc4e65 MDL-39947 mod_forum: Add safety check to variable assignment when counting unread posts 2013-05-31 09:45:56 +09:30
Andreas Grabs
e6e9bec3ee MDL-39932 mod_feedback - Mapping Feedback when Course is Deleted - thx to David N. Johnson 2013-05-30 23:10:33 +02:00
David Mudrák
b60ab47cb7 MDL-39939 Fix the basic SCORM report plugin name 2013-05-30 22:42:12 +02:00
Damyon Wiese
7775545197 MDL-39317 assign: Fix for submitted filter on grading table.
Some old upgraded assignments have no timecreated column so use
a different one to check for a valid submission.
2013-05-29 14:40:50 +08:00
Ashley Holman
c7e4403c9f MDL-39743 assign: Fix missing capability check for "grant extension" 2013-05-29 11:58:48 +08:00
Damyon Wiese
48488bfb39 MDL-39821 assign: missing setType with advanced grading 2013-05-29 11:20:56 +08:00
David Monllao
69a397cd2c MDL-39795 behat: Adapting features to consider spaces 2013-05-27 14:24:20 +08:00
Adrian Greeve
4a28ff88fb MDL-26998 - mod_wiki: the page_wiki class now stores the course module object. 2013-05-23 15:11:32 +08:00
Jason Fowler
f505aab201 MDL-39227 - SCORM - repositioning the navigation panel to be visible in all themes at all resolutions 2013-05-22 15:14:56 +08:00
Dan Poltawski
a22b8a83e7 Merge branch 'MDL-39753' of git://github.com/stronk7/moodle 2013-05-21 10:58:37 +08:00
Eloy Lafuente (stronk7)
34e8106f5f Merge branch 'MDL-26120' of https://github.com/jacks92/moodle 2013-05-21 00:54:08 +02:00
Ruslan Kabalin
3257f85f23 MDL-39761: mod_assign: Always check submission plugin status and visibility. 2013-05-20 15:57:52 +01:00
Eloy Lafuente (stronk7)
c9e54743ec MDL-39753 Add 2.5.0 upgrade line 2013-05-20 15:33:19 +02:00
Dan Poltawski
ef78682e44 Merge branch 'w18_MDL-39374_m26_folderlog' of git://github.com/skodak/moodle 2013-05-20 17:58:09 +08:00
Dan Poltawski
b04bfcfc54 Merge branch 'wip-MDL-36020-master' of git://github.com/troylee/moodle 2013-05-20 12:42:17 +08:00
Damyon Wiese
e872912d1c Merge branch 'MDL-39363-master' of git://github.com/ankitagarwal/moodle 2013-05-20 12:12:23 +08:00
Petr Škoda
d6c60a7d16 MDL-39374 log only real folder edits
Credit goes to Florian Zillner, thanks.
2013-05-15 21:34:03 +02:00
Troy Lee
62af3fe42b MDL-36020 overview/report: fix quiz regrade session lock 2013-05-14 10:46:13 +08:00
Eloy Lafuente (stronk7)
522b5faf60 Merge branch 'MDL-39642-en_fix' of git://github.com/mudrd8mz/moodle
Conflicts:
	lang/en/badges.php
2013-05-13 12:07:55 +02:00
Helen Foster
9f3e096899 MDL-39642 Merge English strings from the en_fix language pack 2013-05-13 09:58:43 +02:00
Damyon Wiese
d9ffe3f945 Merge branch 'MDL-39611-master-int' of git://github.com/FMCorz/moodle 2013-05-13 13:22:32 +08:00
Frederic Massart
914077b4a8 MDL-39611 url: Fix setType warnings in module settings 2013-05-10 15:49:39 +08:00
Sam Hemelryk
635d8bc84b Merge branch 'MDL-39488' of git://github.com/rwijaya/moodle 2013-05-10 16:23:26 +12:00
Rossiani Wijaya
89aa433fbd MDL-39488: Lesson Module: Fixed the potential variable overwritting for answers 2013-05-10 11:14:52 +08:00
Jayesh Anandani
1ecd3c304d MDL-39155 Quiz: Provide 3 image-size options on the settings page 2013-05-10 08:38:13 +05:30
Damyon Wiese
dec909fcdd Merge branch 'MDL-38757-master-int' of git://github.com/FMCorz/moodle 2013-05-10 09:35:44 +08:00
Eloy Lafuente (stronk7)
1065589db1 Merge branch 'MDL-39586_master' of git://github.com/dmonllao/moodle 2013-05-10 02:31:50 +02:00
Eloy Lafuente (stronk7)
d560159df6 Merge branch 'MDL-39488' of git://github.com/rwijaya/moodle 2013-05-09 15:47:38 +02:00
David Monllao
5d7b6307b1 MDL-39586 behat: Closed list of stackeholders 2013-05-09 18:38:13 +08:00
Frederic Massart
9fba869836 MDL-38757 scorm: Remove advanced settings (except for Appearance) 2013-05-09 17:20:11 +08:00
Frederic Massart
20b51a1134 MDL-38757 scorm: Reformat SCORM package module settings 2013-05-09 17:20:07 +08:00
Eloy Lafuente (stronk7)
919a8db0a2 Merge branch 'MDL-39463_master' of https://github.com/markn86/moodle 2013-05-09 00:35:28 +02:00
Dan Poltawski
2022330dd7 Merge branch 'MDL-39545_master' of https://github.com/markn86/moodle 2013-05-08 12:37:18 +01:00
Mark Nelson
e019dcccdf MDL-39463 forms: use the date selectors 'optional' parameter rather than creating additional logic 2013-05-08 16:36:54 +08:00
Rossiani Wijaya
3b3e7fd11c MDL-39488 Lesson Module: Improve code performance 2013-05-08 13:53:38 +08:00
Rossiani Wijaya
51fce0f6e0 MDL-39488 Lesson Module: Fixed PHP error matching question,
if one or more options have not been selected.
2013-05-08 13:53:38 +08:00
Joseph Rézeau
b0e9cdd45b MDL-39488 Lesson Module: Fix for "Match question throws PHP error if one or more options have not been selected "
Signed-off-by: Joseph Rézeau <moodle@rezeau.org>
2013-05-08 13:53:31 +08:00