mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-09 02:12:22 +02:00
Code Issues Projects Releases Wiki Activity
67,376 Commits 36 Branches 530 Tags
Commit Graph

15242 Commits

Author SHA1 Message Date
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
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
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
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
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
Damyon Wiese
d63e7470a9 MDL-44745 Assign: Make the grading table use the fullname function from the assign class. 
This will take blind marking into account when displaying student names.
 2014-03-25 12:45:36 +08:00
Sam Hemelryk
11862768ce Merge branch 'wip-MDL-40059-master' of git://github.com/marinaglancy/moodle 2014-03-25 16:11:10 +13:00
Sam Hemelryk
027d10d67f Merge branch 'MDL-44075-master-v3' of git://github.com/jamiepratt/moodle 2014-03-25 15:06:44 +13:00
Sam Hemelryk
8134eb8573 Merge branch 'MDL-44535-master-v2' of https://github.com/jamiepratt/moodle 2014-03-25 12:51:14 +13:00
Damyon Wiese
b5196badcd MDL-43960 assign: Add missing include 
There was a report of mod_assign_save_grade webservice failing because of this.
I couldn't reproduce it, but grepping the code found one place where this include
should be added.
 2014-03-25 12:38:09 +13:00
Andrew Nicols
6bf267776c MDL-28261 Javascript: Check for a working connection in SCORM activities 2014-03-24 23:48:32 +08:00
Mark Nelson
cc033d48b5 MDL-44316 core_tag: changed the API to accept a contextid and component 2014-03-22 13:50:08 -07:00
Tim Hunt
f38965db42 MDL-44665 declare all quiz page types in the blocks UI. 2014-03-21 14:40:57 +00:00
Marina Glancy
2d4d742f71 MDL-40059 glossary: unittests for events 2014-03-21 15:48:51 +08:00
Marina Glancy
7c92f9be80 MDL-40059 glossary: event for entry viewed 2014-03-21 15:48:51 +08:00
Marina Glancy
1ce054a38b MDL-40059 glossary: events for entry approval/disapproval 2014-03-21 15:48:51 +08:00
Marina Glancy
4d7c298f51 MDL-40059 glossary: events for add/edit/delete glossary category 2014-03-21 15:48:51 +08:00
Marina Glancy
99912e3044 MDL-40059 glossary: events for add/delete/update entries 2014-03-21 15:48:50 +08:00
Marina Glancy
f527c5d040 MDL-40059 glossary: event course_module_instance_list_viewed 2014-03-21 15:48:50 +08:00