Commit graph

15340 commits

Author SHA1 Message Date
Dan Poltawski
d1426e2843 Merge branch 'MDL-33952-master' of git://github.com/damyon/moodle
Conflicts:
	mod/assignment/lang/en/assignment.php
2014-01-13 12:55:36 +08:00
Eloy Lafuente (stronk7)
12efa52762 MDL-43646 "disapprove" changed to "undo approval" 2014-01-10 19:54:10 +01:00
Eloy Lafuente (stronk7)
7123ae8f9a MDL-43590 move unapprove to undo approval 2014-01-10 18:56:10 +01:00
Michael Aherne
f56ad6036f MDL-46310 assign Prevent blind marking submission notification email being sent to noreplyemail address 2014-01-10 15:19:04 +00:00
Tony Butler
802f85076a MDL-43632 mod_feedback: Use SSL for reCAPTCHA API request if Moodle is using it 2014-01-10 10:40:23 +00:00
David Monllao
50edfdca03 MDL-43584 behat: Updating features to use the new expected arguments 2014-01-10 18:25:44 +08:00
Eloy Lafuente (stronk7)
577432283c Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle 2014-01-10 10:08:34 +01:00
Dan Marsden
aafb7a5b95 MDL-43222 SCORM: correct check for list of attempts and make correct check for current attempt in scorm_get_toc 2014-01-10 22:04:09 +13:00
Dan Marsden
2526d7e178 MDL-42792 SCORM: Prevent JS error when network connection fails. - return false to SCORM package so that issue can be detected and reported. 2014-01-10 21:04:54 +13:00
Dan Marsden
434cab3c79 MDL-41577 SCORM: remove old IE9 hack that didn't really work. 2014-01-10 20:46:05 +13:00
Rajesh Taneja
4a536604b8 MDL-40917 mod_resource: replaced add_to_log with events 2014-01-10 14:12:07 +08:00
Andrew Davis
2b860793a6 MDL-43178 mod_forum: fixed the digest setting confirmation message 2014-01-10 08:33:03 +08:00
Eloy Lafuente (stronk7)
24d74a6804 Merge branch 'wip-MDL-43283-master' of git://github.com/marinaglancy/moodle 2014-01-09 23:07:19 +01:00
Tim Hunt
d62382d1f9 MDL-40313 question bank search classes should be namespaced. 2014-01-09 18:26:21 +00:00
Tim Hunt
e22e749002 MDL-40313 Fix code and doc checker warnings. 2014-01-09 18:26:18 +00:00
Ray Morris
efa5155a2a MDL-40313 questionbank: Add question filtering API
Add new API for filtering questions, refactoring the options to display
old questions and include subcategories into new
question_bank_search_condition classes. Make the new API pluggable via
local_[pluginname]_get_question_bank_search_conditions.
2014-01-09 16:46:42 +00:00
Frederic Massart
63fe00c996 MDL-43401 mod_lesson: Fix serving of the pluginfile mediafile 2014-01-09 16:53:55 +01:00
Frederic Massart
582ba677fd MDL-43371 mod_lesson: Remove files upon page or module deletion 2014-01-09 16:20:20 +01:00
Marina Glancy
1f47813b29 MDL-43283 mod_chat: corrected SQL query to follow strict groupping rules 2014-01-09 15:37:38 +08:00
Helen Foster
480fca77b3 MDL-43590 Merge English strings from the en_fix language pack 2014-01-09 01:06:01 +01:00
Tim Hunt
1f8ff396d2 MDL-43412 quiz with grade period and password did not work.
Once the attempt became overdue, it was impossible to get in to submit
it because of a redirect loop. This fix resovles that loop, so the
student can enter their password and get in.
2014-01-08 17:55:25 +00:00
Damyon Wiese
40cb48792a MDL-33952 Assignment - bon voyage!
mod_assignment has been replaced with a stub that only exists to support restoring and
auto upgrading to mod_assign. If you require mod_assignment for some old plugin, then
overwrite with the 2.6 version manually.
2014-01-08 14:51:06 +08:00
Dan Poltawski
a6fa74bca3 Merge branch 'MDL-43595-master' of git://github.com/damyon/moodle 2014-01-08 11:34:46 +08:00
Damyon Wiese
8e1266bf77 MDL-33600 Assign: Add an admin setting to set the default for sendstudentnotifications 2014-01-08 11:03:59 +08:00
Damyon Wiese
f7dc9871e7 MDL-33600 Assign: Allow teachers to skip notifying students about grade update. 2014-01-08 10:34:57 +08:00
Damyon Wiese
cf1110eb62 MDL-43595: The dropdowns for editpdf stopped working due to a recent change. 2014-01-08 09:15:58 +08:00
Eloy Lafuente (stronk7)
0601a82aff Merge branch 'wip-MDL-42310-master' of git://github.com/abgreeve/moodle 2014-01-08 01:32:28 +01:00
Eloy Lafuente (stronk7)
b8a8f3dd01 Merge branch 'MDL-42607_rss' of https://github.com/andyjdavis/moodle 2014-01-08 00:39:15 +01:00
Dan Poltawski
571944c2a1 Merge branch 'm27_MDL-43482_Lot_Of_Passed_By_Reference_Messages' of https://github.com/scara/moodle 2014-01-07 17:20:44 +08:00
Damyon Wiese
abc217b2bf Merge branch 'MDL-43307-master' of git://github.com/andrewnicols/moodle 2014-01-07 14:10:40 +08:00
Damyon Wiese
e011f229a8 Merge branch 'w01_MDL-43402_m27_zlib' of https://github.com/skodak/moodle 2014-01-07 12:29:45 +08:00
Damyon Wiese
de47c9c81b Merge branch 'wip-mdl-43293' of https://github.com/rajeshtaneja/moodle 2014-01-07 12:22:49 +08:00
Dan Poltawski
812cc702ad Merge branch 'MDL-42995-master-3rd' of git://github.com/FMCorz/moodle 2014-01-07 11:51:15 +08:00
Dan Poltawski
93759b73a5 Merge branch 'MDL-42585-master' of git://github.com/damyon/moodle
Conflicts:
	mod/assign/version.php
2014-01-07 10:55:20 +08:00
Frederic Massart
f588ea5008 MDL-42995 mod_assign: Extended tests for update_calendar method 2014-01-06 10:20:23 +01:00
Frederic Massart
0cfc7d13ef MDL-42995 mod_assign: Remove files from calendar event description 2014-01-06 09:29:26 +01:00
Frederic Massart
2a5794e099 MDL-42995 mod_assign: Use new global function to strip content 2014-01-06 09:29:25 +01:00
Damyon Wiese
717093583f Merge branch 'MDL-43454-master' of git://github.com/FMCorz/moodle 2014-01-06 15:51:25 +08:00
Damyon Wiese
5490662ade Merge branch 'MDL-41690-master' of git://github.com/danpoltawski/moodle
Conflicts:
	course/dnduploadlib.php
2014-01-06 15:48:31 +08:00
Dan Poltawski
00447fd617 Merge branch 'MDL-40922_master' of https://github.com/markn86/moodle 2014-01-06 15:11:23 +08:00
Dan Poltawski
73ee2fda6b MDL-41690 course: remove use of deprecated functions 2014-01-06 10:45:59 +08:00
Sam Hemelryk
7c445ab8c0 Merge branch 'w01_MDL-43527_m27_safemode' of https://github.com/skodak/moodle 2014-01-06 14:46:31 +13:00
Sam Hemelryk
e4ac256c35 Merge branch 'wip-mdl-18770' of https://github.com/rajeshtaneja/moodle 2014-01-06 13:09:42 +13:00
Sam Hemelryk
e6d3f9438e Merge branch 'MDL-40054_master' of https://github.com/markn86/moodle 2014-01-06 12:01:54 +13:00
Sam Hemelryk
a9bd004c8c Merge branch 'MDL-35973_redirect' of https://github.com/andyjdavis/moodle 2014-01-06 11:28:34 +13:00
Sam Hemelryk
f29dcf642b Merge branch 'MDL-42212-master' of git://github.com/FMCorz/moodle 2014-01-06 10:30:31 +13:00
Sam Hemelryk
dfed81ae12 Merge branch 'MDL-36334-master' of git://github.com/andrewnicols/moodle 2014-01-06 09:53:15 +13:00
Sam Hemelryk
2dad31ecf9 MDL-43238 mod_assign: removed incorrect validation 2014-01-06 09:51:38 +13:00
Rajesh Taneja
456d7bc7f3 MDL-18770 mod_assign: Set gradetype to GRADE_TYPE_NONE if feedback not enabled 2014-01-03 16:30:37 +08:00
Rajesh Taneja
184afb6b73 MDL-43238 events: Added event other information in event php doc block 2014-01-03 15:03:48 +08:00