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

16321 Commits

Author SHA1 Message Date
Jean-Michel Vedrine
2d586d1d85 MDL-48675 mod_lesson: behat tests for pages edition 2015-01-08 20:59:59 +01:00
Jean-Michel Vedrine
a748983aa2 MDL-48675 mod_lesson: Error displayed while editing content page jumps 
This change also fix MDL-32343 and MDL-31778 related to problems
when editing cluster pages.
 2015-01-08 20:58:15 +01:00
Eloy Lafuente (stronk7)
ae3663a082 Merge branch 'MDL-48748-master-enfix' of git://github.com/mudrd8mz/moodle 2015-01-07 17:15:52 +01:00
Mark Nelson
3f94c97a99 MDL-46498 mod_assign: fixed failing behat test due to GS 2015-01-06 20:48:35 -08:00
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
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
9157b842c4 Merge branch 'MDL-46015' of git://github.com/jmvedrine/moodle 2015-01-06 11:57:58 +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
ccd8992b29 Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle 2015-01-06 11:11:42 +00:00
David Monllao
0953e38792 Merge branch 'MDL-38222' of git://github.com/jmvedrine/moodle 2015-01-06 12:27:04 +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
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
e653b9a469 Merge branch 'MDL-48631' of git://github.com/jmvedrine/moodle 2015-01-06 09:08:14 +08: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
Andrew Nicols
c84888c1cc MDL-48106 mod_glossary: Add missing sesskey checks 2015-01-05 13:37:54 +00:00
Jetha Chan
da4c33f510 MDL-47920 mod_lti: add capability checks, http headers 2015-01-05 12:48:09 +00:00
Ankit Agarwal
c21c92f11f MDL-48372 mod_data: Add http to urls without it during import 2015-01-02 10:37:32 +05:30
Jean-Michel Vedrine
b5914b61da MDL-47070 mod_lesson: useless db query that should be deleted 2015-01-01 22:07:59 +01:00
Dan Poltawski
136e05a7ff MDL-43198 folder: respect ignorefilesizelimits permission 
Thanks to Miryan Salas for the patch.
 2014-12-29 12:12:21 +00:00
Jean-Michel Vedrine
2e6b9f5c9b MDL-48631 mod_lesson: tables 'grade' item have incorrect precision 2014-12-29 10:46:19 +01:00
Ankit Agarwal
5d78635e40 MDL-48704 inbound: Fix notices in pickup task 2014-12-29 14:38:07 +05:30
Eugene Venter
53339437cd MDL-46015 lesson: Optimise report - use recordsets 
Change-Id: I61f3ed30c6dbd8f88d1dfb1adfe2fc291853e0e1
 2014-12-28 11:00:57 +01:00
Mark Nelson
5758de531c MDL-48549 mod_assign: added upgrade to clean the tables 2014-12-26 19:01:36 -08:00
Mark Nelson
26ac0abc22 MDL-48549 mod_assign: delete entries from the flags/mapping tables 2014-12-26 18:53:14 -08:00
Mark Nelson
d4aa23d09e MDL-46498 mod_assign: added behat tests 2014-12-26 17:48:06 -08:00
Jean-Michel Vedrine
a174a0ac23 MDL-48707 mod_lesson: ignore plugins question types during import 2014-12-26 08:28:36 +01:00
Jean-Michel Vedrine
0d4705c76a MDL-38222 mod_lesson: Error in Lesson Cluster for Unseen Questions 2014-12-25 21:21:41 +01:00
Mark Nelson
bd3ee80716 MDL-46498 mod_assign: display correct grading status 2014-12-23 23:46:22 -08:00
Mark Nelson
c588fdac36 MDL-48534 mod_assign: display correct workflow state and marker 2014-12-23 22:37:25 -08:00
Dan Poltawski
3f6d5ea621 MDL-20304 lesson: add behat test for practice lessons 2014-12-23 16:51:53 +00:00
Dan Poltawski
cb878d027b Revert "Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle" 
This reverts commit b8572fa90435390fc18c2fe537403f7931d966aa, reversing
changes made to 172d7f16cecc7c666352086d40f4d5e84c714d32.
 2014-12-23 10:46:39 +00:00
Dan Poltawski
f957ec61ca Merge branch 'MDL-43730-master' of git://github.com/ankitagarwal/moodle 2014-12-22 16:34:48 +00:00
Dan Poltawski
b8572fa904 Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle 2014-12-22 13:52:36 +00:00
Dan Poltawski
d29f655a99 Merge branch 'MDL-48666' of git://github.com/timhunt/moodle 2014-12-22 11:53:15 +00:00
Jean-Michel Vedrine
25345cb4cd MDL-48244 Lesson: add custom end of lesson reached completion rule 2014-12-21 16:23:49 +01:00
Tim Hunt
fe03b762c9 MDL-48666 quiz: let JS to get a Qs slot number on the summary page 2014-12-19 14:39:15 +00:00
Andrew Nicols
2da076e6bc Merge branch 'MDL-45324_master' of https://github.com/markn86/moodle 2014-12-18 14:07:46 +08:00
David Monllao
2d7b234362 Merge branch 'MDL-48235-master-fixes' of git://github.com/xow/moodle 2014-12-18 12:35:55 +08:00
Zachary Durber
a68b8d8d16 MDL-47442 mod_assign: Notify student when quick-grading grade 2014-12-18 12:10:01 +08:00
John Okely
3a5581c1ad MDL-48235 mod_assign: Fix grade of 0 not showing on feedback page in oracle 2014-12-18 10:23:03 +08:00
Ankit Agarwal
c905907bdd MDL-43730 mod_book: Automate MDLQA-2426 
Behat feature to make sure show/hide feature for book chapter works as expected
 2014-12-17 22:29:04 +05:30
Ankit Agarwal
22255d8c78 MDL-43730 mod_book: Make chapter action links accessible 2014-12-17 22:28:05 +05:30
Dan Poltawski
9bb712a047 MDL-20304 lesson: do not display gradebook link when in practice mode 
Practice mode means the grades do not go to the gradebook, so do not
display the gradebook link at the end of the lesson
 2014-12-17 15:58:31 +00:00
Atanas Atanasov
33ce9e581a MDL-20304 lesson: do not send practice lesson grades to gradebook 2014-12-17 14:17:50 +00:00