mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-04 07:52:48 +02:00
Code Issues Projects Releases Wiki Activity
67,420 Commits 36 Branches 528 Tags
Commit Graph

15256 Commits

Author SHA1 Message Date
Rajesh Taneja
ae8c220fd5 MDL-44832 behat: Fixed behat test 2014-04-03 10:59:58 +08:00
Damyon Wiese
c8afcb2e7b Merge branch 'master_MDL-44753' of https://github.com/danmarsden/moodle 2014-04-02 16:33:06 +08:00
Dan Marsden
e067e6f0ad MDL-44753 SCORM: make correct selection of first sco - also fixes MDL-44896 2014-04-02 20:50:21 +13:00
Marina Glancy
0123472c87 Merge branch 'MDL-41063' of git://github.com/jmvedrine/moodle 2014-04-02 09:46:35 +08:00
Eloy Lafuente (stronk7)
2e20fc3742 Merge branch 'MDL-31262' of git://github.com/timhunt/moodle 2014-04-02 03:18:05 +02:00
Marina Glancy
cc7c745c7d Merge branch 'master_MDL-44753' of git://github.com/danmarsden/moodle 2014-04-02 09:15:33 +08:00
Eloy Lafuente (stronk7)
6faa517856 Merge branch 'wip-MDL-34012-master' of git://github.com/marinaglancy/moodle 2014-04-02 02:57:15 +02:00
Eloy Lafuente (stronk7)
b224448ac6 Merge branch 'wip-MDL-43398-master' of git://github.com/marinaglancy/moodle 2014-04-02 02:47:59 +02:00
Sam Hemelryk
3ed2a4b2cc Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle 2014-04-02 13:04:46 +13:00
Eloy Lafuente (stronk7)
929e32489f Merge branch 'MDL-28261-master' of git://github.com/andrewnicols/moodle 2014-04-02 01:12:52 +02:00
Dan Marsden
c87a50cb45 MDL-44753 SCORM: add check during SCORM restore to make sure valid launch sco is set 2014-04-02 10:01:54 +13:00
Sam Hemelryk
067573bd02 Merge branch 'MDL-44832-master' of git://github.com/damyon/moodle 2014-04-02 09:54:33 +13:00
Eloy Lafuente (stronk7)
eafbd56da9 Merge branch 'wip-MDL-35305-master' of git://github.com/marinaglancy/moodle 2014-04-01 21:50:09 +02:00
Marina Glancy
e3e9701113 Merge branch 'wip-MDL44021' of git://github.com/jennymgray/moodle 2014-04-01 17:40:22 +08:00
Jenny Gray
f8b3cd4bdf MDL-44021 mod_glossary - fixed search multiple keywords sql duplicate parameter error 2014-04-01 09:34:06 +01:00
Sam Hemelryk
4b92f2b79b Merge branch 'MDL-44745-master' of git://github.com/damyon/moodle 2014-04-01 21:20:05 +13:00
Ankit Agarwal
b63f773296 MDL-44717 events: Fix multiple issues in events 
Fix various incorrect urls
Fix incorrect phpdocs and other minor code style issues
Fix missing/incorrect strings

AMOS BEGIN
 MOV [eventblogassociationcreated, core_blog],[eventblogassociationadded, core_blog]
AMOS END
 2014-04-01 15:08:34 +08:00
Adrian Greeve
55f59c2b44 MDL-44717 events: Quick update to incorrect mod workshop class definition. 2014-04-01 14:45:05 +08:00
Marina Glancy
0b1afc71bb Merge branch 'w14_MDL-44715_m27_eventval' of git://github.com/skodak/moodle 2014-04-01 13:45:59 +08:00
Marina Glancy
902eec06e9 Merge branch 'MDL-44811' of git://github.com/timhunt/moodle 2014-04-01 13:24:09 +08:00
Damyon Wiese
c70de965aa MDL-44583 Assign: performance fixes 2014-03-31 12:53:02 +08:00
Marina Glancy
7e1288f847 Merge branch 'MDL-44822' of git://github.com/aolley/moodle 2014-03-31 12:46:21 +08:00
Jean-Michel Vedrine
f88d75e51a MDL-41063 Lesson qformat_default class is missing an error function 2014-03-30 09:03:38 +02:00
Tim Hunt
6a981b45c3 MDL-31262 fix quiz review capability check. 
This change is logically the same as changing
    $this->has_capability('mod/quiz:viewreports')
to
    $this->has_capability('mod/quiz:viewreports') || $this->has_capability('mod/quiz:preview')
in the original code. However, I rewrote the logic so that we test the
most common and performance-critical case first - that of a student
lookign at their own attempt.
 2014-03-28 18:37:21 +00:00
Tim Hunt
4dc30936f7 MDL-44811 quiz settings form title: change for consistency. 
Thanks to Fred for poining out that most other activities use the work
Appearance for these sorts of settings.
 2014-03-28 18:02:02 +00:00
Marina Glancy
9dbcfd93e4 MDL-34012 chat: removing repetetive db query (performance) 2014-03-28 15:21:08 +08:00
Petr Škoda
578645aadf MDL-44715 use parent::validate_data() consistently in all events 
Includes some minor PHPDocs typo fixes.
 2014-03-28 14:09:31 +08:00
Damyon Wiese
e9ddbae9c0 MDL-44832 Assign: Convert grading menu to a moodle action-menu 
This is required because YUI broke something.
 2014-03-28 12:56:46 +08:00
Marina Glancy
e9e9b197b3 MDL-35305 wiki: backup and restore files 
Thanks to Tatsuya Shirai for the patch
 2014-03-28 10:30:45 +08:00
Marina Glancy
5ffb5fd4b3 MDL-43398 wiki: remove extra Choose... option from select 2014-03-27 14:58:33 +08:00
Jerome Mouneyrac
3ef5218b30 MDL-43398 Wiki: Choose... options cause SQL errors or seen inappropriate. 2014-03-27 14:58:28 +08:00
Damyon Wiese
46bb7a5a7f MDL-43883 Fix wiki behat tests to work with Atto 2014-03-27 13:02:31 +08:00
Rajesh Taneja
3e469992a1 MDL-44084 behat: Fixed setting value for form editor 2014-03-27 12:12:09 +08:00
Petr Škoda
aed0f5b78c MDL-44824 add missing subplugin type names 2014-03-27 11:46:36 +08:00
Petr Škoda
f805fd1203 MDL-44824 add missing subplugin type names 2014-03-27 11:46:20 +08:00
Adam Olley
9f7674bddc MDL-44822 assignfeedback_editpdf: Stop test generation in is_enabled() 
This change also moves one of the checks in test_gs_path. If
generateimage is false, there's no need to stat for the fixture file.
 2014-03-27 10:16:53 +10:30
Jetha Chan
0326b83149 MDL-42588 mod_scorm: option for displaying activity name 
Added option to display or hide activity name on SCORM player.
 2014-03-26 15:27:50 +08:00
Sam Hemelryk
46c627cf05 Merge branch 'MDL-44690-master' of git://github.com/jamiepratt/moodle 2014-03-26 13:25:51 +13:00
Marina Glancy
daf7b64ef7 Merge branch 'w13_MDL-44107_m27_canview' of git://github.com/skodak/moodle 2014-03-25 17:10:27 +08:00
Andrew Nicols
1f777e5c6c MDL-41987 Javascript: Tidy up YUI documentation 2014-03-25 17:01:37 +08:00
Marina Glancy
e34003004e MDL-42588 scorm: revert accidental change of variable module back to plugin 2014-03-25 16:43:24 +08:00
Jetha Chan
74d2a9df6d MDL-42588 mod_scorm: display activity name 
Added option to display or hide activity name on SCORM player. Added default admin setting and amended generator accordingly.
 2014-03-25 16:20:52 +08:00
Marina Glancy
d43556a63f Merge branch 'mdl44573-master' of git://github.com/tlock/moodle 2014-03-25 16:20:37 +08:00
Marina Glancy
c5ff2a76e1 Merge branch 'MDL-42575-master' of git://github.com/jethac/moodle 2014-03-25 16:19:33 +08:00
Jetha Chan
197407cabe MDL-42588 mod_scorm: display activity name 
Added option to display or hide activity name on SCORM player.
 2014-03-25 16:17:00 +08:00
James Pratt
49dda8fe6e MDL-44690 core_questions : amending unit tests 
to use more human friendly format for submitted question type data.
 2014-03-25 14:37:51 +07:00
Petr Škoda
15f009e1a2 MDL-44107 add debugging to deprecated event::can_view() 2014-03-25 14:53:17 +08:00
Marina Glancy
2bcb6dbeb0 Merge branch 'MDL-44665' of git://github.com/timhunt/moodle 2014-03-25 14:28:55 +08:00
Marina Glancy
81e50a3661 Merge branch 'MDL-44316_master' of git://github.com/markn86/moodle 2014-03-25 14:03:06 +08:00
Damyon Wiese
4309255896 MDL-44745 Assign: Fix typo in assign->fullname function 
This is a new function on master only.
 2014-03-25 12:49:36 +08:00