mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 23:42:39 +02:00
Code Issues Projects Releases Wiki Activity
71,878 Commits 36 Branches 528 Tags
Commit Graph

71878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
9a99c21caf Merge branch 'master_MDL-48428' of https://github.com/greg-or/moodle-mod_assign 2015-01-07 10:23:57 +08:00
David Monllao
b301753ba9 Merge branch 'MDL-48549_master' of git://github.com/markn86/moodle 2015-01-07 09:37:35 +08:00
David Monllao
3d10161c03 Merge branch 'wip-MDL-48523-master' of git://github.com/abgreeve/moodle 2015-01-07 09:22:48 +08:00
Eloy Lafuente (stronk7)
a158a85668 Merge branch 'MDL-32088-master' of git://github.com/danpoltawski/moodle 2015-01-07 02:11:41 +01:00
David Monllao
fcec67db13 Merge branch 'MDL-48697-master' of git://github.com/ankitagarwal/moodle 2015-01-07 09:05:51 +08:00
David Monllao
ccc1782b69 Merge branch 'MDL-48688-master' of git://github.com/ankitagarwal/moodle 2015-01-07 08:47:37 +08:00
Helen Foster
b7853012b8 MDL-48748 lang: Merge English strings from the en_fix language pack 2015-01-06 21:53:17 +01:00
Jean-Michel Vedrine
b9c86823c7 MDL-48034 mod_lesson: grade capability missing RISK_XSS 2015-01-06 12:50:40 +00:00
Dan Poltawski
35aff62bf7 Merge branch 'MDL-44393-master' of git://github.com/ankitagarwal/moodle 2015-01-06 12:21:01 +00:00
Dan Poltawski
9157b842c4 Merge branch 'MDL-46015' of git://github.com/jmvedrine/moodle 2015-01-06 11:57:58 +00:00
Dan Poltawski
0aa2c4e9c2 Merge branch 'm28_MDL-46814' of https://github.com/totara/moodle 2015-01-06 11:45:23 +00:00
Dan Poltawski
ada0fc253c Merge branch 'MDL-47070' of git://github.com/jmvedrine/moodle 2015-01-06 11:26:41 +00:00
Dan Poltawski
fba50fc273 Merge branch 'MDL-48372-master' of git://github.com/ankitagarwal/moodle 2015-01-06 11:22:45 +00:00
Dan Poltawski
b7f92c3845 Merge branch 'MDL-48442-master' of git://github.com/ankitagarwal/moodle 2015-01-06 11:19:20 +00:00
Dan Poltawski
ccd8992b29 Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle 2015-01-06 11:11:42 +00:00
Dan Poltawski
50808a9a32 Merge branch 'MDL-48655-master' of git://github.com/merrill-oakland/moodle 2015-01-06 11:09:41 +00:00
Simey Lameze
fb60e23a67 MDL-47964 auth_shibboleth: Fix DOS on the shibboleth logout 2015-01-06 10:59:30 +00:00
Andrew Nicols
7f9db4747c Merge branch 'MDL-48640-duplicated-code' of https://github.com/rougeth/moodle 2015-01-06 15:51:12 +08:00
John Okely
02ff22e925 MDL-39103 lesson: Fix lesson administration block 
Credit to Joseph Rézeau for the fix
 2015-01-06 14:51:53 +08:00
David Monllao
0953e38792 Merge branch 'MDL-38222' of git://github.com/jmvedrine/moodle 2015-01-06 12:27:04 +08:00
Andrew Nicols
388b49d5f6 Merge branch 'MDL-48701-master' of git://github.com/ankitagarwal/moodle 2015-01-06 12:04:59 +08:00
Andrew Nicols
a7a50c2cee Merge branch 'MDL-48704-master' of git://github.com/ankitagarwal/moodle 2015-01-06 11:58:29 +08:00
Andrew Nicols
19e819bad4 Merge branch 'MDL-48707' of git://github.com/jmvedrine/moodle 2015-01-06 11:49:57 +08:00
Andrew Nicols
436d1a1787 Merge branch '28067-29' of git://github.com/samhemelryk/moodle 2015-01-06 10:52:31 +08:00
Andrew Nicols
fefd49f70e MDL-20304 lesson: Uncomment tests following MDL-48631 2015-01-06 10:37:17 +08:00
Andrew Nicols
fc8925206e Merge branch 'MDL-20304-master' of git://github.com/danpoltawski/moodle 2015-01-06 10:37:10 +08:00
David Monllao
5b97de39f1 Merge branch 'MDL-35078-master' of git://github.com/danpoltawski/moodle 2015-01-06 10:35:04 +08:00
John Okely
cf6d62fc3f MDL-47761 enrol: Show more detail for self-enrolment errors 
Thanks to Mirko Otto for the solution
 2015-01-06 10:19:18 +08:00
David Monllao
e653b9a469 Merge branch 'MDL-48631' of git://github.com/jmvedrine/moodle 2015-01-06 09:08:14 +08:00
Dan Poltawski
44c3131c08 Merge branch 'MDL-48441_profile_guest' of https://github.com/andyjdavis/moodle 2015-01-05 18:30:24 +00:00
Dan Poltawski
4aef356fd2 Merge branch 'MDL-46498_master' of https://github.com/markn86/moodle 2015-01-05 17:47:52 +00:00
Andrew Nicols
f06fc2b5c4 MDL-48104 mod_assign: Strip out use of eval() for string parsing 
I've also replaced other  occurrences of M.str with the correct use of
M.util.get_string() instead.
 2015-01-05 17:20:41 +00:00
Dan Poltawski
a2c5d58e93 Merge branch 'MDL-43679-master' of git://github.com/FMCorz/moodle 2015-01-05 15:49:23 +00:00
Simey Lameze
76aea854f6 MDL-48017 core_calendar: add context validation to get_calendar_events 2015-01-05 14:17:09 +00:00
Andrew Nicols
c84888c1cc MDL-48106 mod_glossary: Add missing sesskey checks 2015-01-05 13:37:54 +00:00
David Monllao
436bbf8975 MDL-48329 core_message: Checking that messaging system is enabled 2015-01-05 13:14:01 +00:00
Simey Lameze
82356399b9 MDL-48368 course: Add warning message to pending courses page 2015-01-05 12:58:33 +00:00
Simey Lameze
52ecd1de0a MDL-48368 course: fix xss on course request pending page 2015-01-05 12:58:33 +00:00
Jetha Chan
da4c33f510 MDL-47920 mod_lti: add capability checks, http headers 2015-01-05 12:48:09 +00:00
Andrew Nicols
e2b9458a7e Merge branch 'MDL-42519' of git://github.com/timhunt/moodle 2015-01-05 16:17:29 +08:00
Andrew Nicols
1f8cc2ed90 Merge branch 'MDL-48582-master' of git://github.com/merrill-oakland/moodle 2015-01-05 15:26:43 +08:00
Andrew Nicols
dd1adc419f Merge branch 'MDL-48644_restoreLegacyLogs' of https://github.com/moodlerooms/moodle 2015-01-05 14:30:56 +08:00
Andrew Nicols
ba5b6abe0e Merge branch 'MDL-48700-master' of git://github.com/merrill-oakland/moodle 2015-01-05 13:30:55 +08:00
Andrew Nicols
1abcc93e0b Merge branch 'MDL-43198-master' of git://github.com/danpoltawski/moodle 2015-01-05 13:22:09 +08:00
Mark Nelson
7f8b554644 MDL-47692 mod_quiz: added additional question_manually_graded trigger 2015-01-04 21:04:03 -08:00
Andrew Nicols
0a149cf019 Merge branch 'MDL-46183-master' of git://github.com/FMCorz/moodle 2015-01-05 11:56:26 +08:00
Aaron Barnes
1151210154 MDL-40097 completion: Apply robust role detection to samesite restores. 2015-01-05 10:30:01 +08:00
Adrian Greeve
a43f43e2fa MDL-40097 completion: Update of code to meet guidlines. 2015-01-05 10:14:03 +08:00
Aaron Barnes
129e786cf4 MDL-40097 completion: Make restoring grade criteria more robust 2015-01-05 10:14:03 +08:00
PJ King
c8c746c440 MDL-46671 availability: DEBUG when course_module does not exist. 
There was a fatal error when calendar event linked to non-extant activities.

Now, instead of throwing an exception when a course_module does not exist, is_user_visible() will print a debug statement.
 2015-01-02 10:34:16 -05:00