mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-24 17:40:26 +01:00
Code Issues Projects Releases Wiki Activity
68,680 Commits 36 Branches 527 Tags
Commit Graph

15619 Commits

Author SHA1 Message Date
Andrew Davis
4257ae82e8 MDL-46036 mod_survey: added logic to prevent user trying to download when there are no results 2014-06-26 11:11:15 +08:00
Damyon Wiese
e192e37f51 MDL-45582 EditPDF: whitespace fix 2014-06-17 10:27:19 +08:00
Damyon Wiese
177cc379ed MDL-45582 Editpdf: Prevent debugging when there is no pdf 2014-06-17 10:21:14 +08:00
Damyon Wiese
fac23f93ec Merge branch 'master_MDL-45582' of git://github.com/greg-or/moodle-mod_assign 2014-06-17 10:20:39 +08:00
Eloy Lafuente (stronk7)
01dca76248 Merge branch 'MDL-45970' of git://github.com/timhunt/moodle 2014-06-17 01:15:21 +02:00
Eloy Lafuente (stronk7)
cf7ac0aebf Merge branch 'wip-mdl-45719-master' of https://github.com/deraadt/moodle 2014-06-17 00:58:50 +02:00
Eloy Lafuente (stronk7)
8888451ed5 Merge branch 'MDL-45870-master' of git://github.com/FMCorz/moodle 2014-06-17 00:51:26 +02:00
Marina Glancy
db8071a7f9 Merge branch 'MDL-45940-master' of git://github.com/damyon/moodle 2014-06-16 17:28:15 +08:00
Marina Glancy
c126413655 Merge branch 'MDL-45901_Quiz_master' of git://github.com/nadavkav/moodle 2014-06-16 17:27:20 +08:00
Gregory Faller
028c9d20b9 MDL-45582: Apply grades and feedback to entire group does not work with Annotate PDF feature 2014-06-16 18:09:21 +09:30
Damyon Wiese
a3d7a82b64 Merge branch 'MDL-42531-alt' of https://github.com/jonof/moodle 2014-06-16 16:26:06 +08:00
Damyon Wiese
de06ce7ed3 MDL-45940 Assign: Improved access check 
Call can_edit() instead of repeating a (slightly wrong) access check.
 2014-06-16 16:20:11 +08:00
Damyon Wiese
b3f297df31 Merge branch 'MDL-31998_master' of git://github.com/grabs/moodle 2014-06-16 12:04:02 +08:00
Damyon Wiese
1df546a77e Merge branch 'MDL-45803_master' of https://github.com/markn86/moodle 2014-06-16 11:00:26 +08:00
Nadav Kavalerchik
c9976d96a5 MDL-45901 - Quiz - Display random questions (from category) on RTL mode. 2014-06-13 12:20:23 +03:00
Andreas Grabs
16ee970c94 MDL-31998 mod_feedback - Feedback depend questions bug 2014-06-13 01:45:23 +02:00
Tim Hunt
4175a57038 MDL-45970 quiz editing: fix display of random questions. 
The pass by reference meant the function was clobbering the variable in
the calling function. Once that was change, it was not strictly
necessary to rename the variable in the function, but I did anyway for
clarity.

Thanks to Rajesh Taneja for finding the problem, and identifying which
bit of code was broken. I really just made the patch.
 2014-06-12 19:45:33 +01:00
Damyon Wiese
c48c9bf02f MDL-42835 Scorm: Fix for JS error because no nodes are selected in the toc. 2014-06-12 13:57:34 +08:00
Mark Nelson
b4cfcf5e53 MDL-45803 mod_quiz: removed the quiz_fire_attempt_started function 
Also commented in mod/quiz/upgrade.txt to inform developers.
 2014-06-11 13:53:59 -07:00
Mark Nelson
62a3472e24 MDL-45803 mod_quiz: removed usage of the function quiz_fire_attempt_started_event 2014-06-11 13:53:03 -07:00
Frederic Massart
13a13c1178 MDL-45870 mod_assign: Behat test covering some outcome usage 2014-06-11 10:33:57 +08:00
Marina Glancy
410bb9a92c Merge branch 'MDL-20154-master' of git://github.com/merrill-oakland/moodle 2014-06-10 15:41:53 +08:00
Damyon Wiese
850833378d Merge branch 'MDL-45761-master' of https://github.com/merrill-oakland/moodle 2014-06-10 14:01:23 +08:00
Damyon Wiese
dc92753a3a Merge branch 'MDL-45767_returnInstanceid' of https://github.com/moodlerooms/moodle 2014-06-10 13:34:01 +08:00
Damyon Wiese
5262686e5f Merge branch 'MDL-45729-master' of http://github.com/damyon/moodle 2014-06-10 13:28:04 +08:00
Damyon Wiese
2d8d99ab5b Merge branch 'MDL-45763-master' of https://github.com/merrill-oakland/moodle 2014-06-10 12:42:09 +08:00
Jonathon Fowler
c462c35b95 MDL-42531 assign: refactor batch operations to use forms properly 
Avoids a lot of ugly optional_param() use. Also fixes the
non-functional cancel buttons.
 2014-06-10 14:06:41 +10:00
Damyon Wiese
5ba4ca894a MDL-45729 assign: Fix for assign unit tests 
Check the user in the params, not the $USER
 2014-06-10 11:39:20 +08:00
Michael de Raadt
d7f87343ce MDL-45719 mod_lti - Pass language strings to inline JS to allow for escaping 2014-06-10 11:35:48 +08:00
Eloy Lafuente (stronk7)
3150271c22 Merge branch 'MDL-45789_master' of https://github.com/markn86/moodle 2014-06-10 01:16:27 +02:00
Eloy Lafuente (stronk7)
d1b183b94b Merge branch 'MDL-45804_master' of https://github.com/markn86/moodle 2014-06-10 01:14:21 +02:00
Mark Nelson
400afba6ab MDL-45803 mod_quiz: prevented the attempt_started event from being triggered twice 2014-06-09 15:59:41 -07:00
Mark Nelson
546a2c95f4 MDL-45803 mod_quiz: added attempt snapshot for the attempt and preview started events 2014-06-09 15:59:26 -07:00
Eloy Lafuente (stronk7)
0a87b6809f Merge branch 'MDL-42835' of git://github.com/nobelium/moodle 2014-06-10 00:36:33 +02:00
Graham Bowman
09fdd221ca MDL-45729 assign: conditional submission summary 
Only show the submission summary if user has assign:submit capability.

Amended to fix some whitespace and the commit message.
 2014-06-09 22:07:15 +02:00
Eloy Lafuente (stronk7)
61e11664c8 Merge branch 'wip-MDL-44501-master' of git://github.com/abgreeve/moodle 2014-06-09 18:59:16 +02:00
Mark Nelson
6e311b5fb3 MDL-45789 mod_wiki: removed undefined "$this->other['itemid']" from the comments_viewed event description 2014-06-05 21:08:27 -07:00
Nobelium
6a761d016c MDL-42835 mod_scorm: Close tree nodes using TreeView API 2014-06-05 22:30:05 +00:00
Eric Merrill
828a4e9f6e MDL-20154 quiz: Remove unused random questions 
When a random question is removed from a quiz, and it is not
in use elsewhere, it should be deleted.
 2014-06-05 11:06:26 -04:00
Eric Merrill
98f52b7dc0 MDL-45761 assign Set inline comment format properly when plugin is empty 
If a plugin says it is empty, skip it for for building the inline
comment.

If not format was found in any plugins, set to FORMAT_HTML, which is
the default for feedback anyways.
 2014-06-05 08:56:24 -04:00
Frederic Massart
78f69e51fc MDL-45870 mod_assign: Outcomes are saved for each group member 2014-06-05 15:56:13 +08:00
Damyon Wiese
c9be25abb3 Merge branch 'MDL-41665_master' of https://github.com/markn86/moodle 2014-06-04 16:15:32 +08:00
Adrian Greeve
f3998ce41e MDL-44501 mod_data: Only attempt to export files when a file exists. 
The error only occurs when portfolios are enabled and there is only one field which is
a file field.
 2014-06-04 15:27:50 +08:00
Mark Nelson
e2cd4f5b95 MDL-41665 mod_scorm: fixed broken report URLs 2014-06-04 00:17:41 -07:00
Marina Glancy
b60e8bb8fa Merge branch 'MDL-18162-master-2' of git://github.com/andrewnicols/moodle 2014-06-04 12:58:03 +08:00
Andrew Nicols
df7a4d6569 MDL-45625 mod_forum: Correct typo in upgrade notes 2014-06-04 11:56:54 +08:00
Andrew Nicols
d9b196d9b6 MDL-18162 mod_forum: Correct @param type in phpdoc to use stdClass 2014-06-04 11:25:38 +08:00
Marina Glancy
6526c48909 Merge branch 'MDL-40851-master' of git://github.com/andrewnicols/moodle 2014-06-04 10:08:10 +08:00
Marina Glancy
0313897108 Merge branch 'wip-mdl-44839' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/phpunit/bootstrap.php
 2014-06-04 10:07:03 +08:00
Eloy Lafuente (stronk7)
71fa28477b Merge branch 'MDL-44620_master' of git://github.com/dmonllao/moodle 2014-06-03 18:11:28 +02:00