mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-15 21:36:58 +01:00
Code Issues Projects Releases Wiki Activity
51,520 Commits 36 Branches 523 Tags
Commit Graph

11679 Commits

Author SHA1 Message Date
Sam Hemelryk
6007f8d8d8 Merge branch 'master_MDL-31381' of git://github.com/danmarsden/moodle 2012-02-20 17:04:45 +13:00
Sam Hemelryk
52b2afa553 Merge branch 'm_MDL-30957_adding_assignment_completion_status_method_and_call' of git://github.com/gerrywastaken/moodle 2012-02-20 16:53:21 +13:00
Gerard (Gerry) Caulfield
ad2d5eba0b MDL-30957 Adding a new method "is_complete" to assignment lib for 
testing if a submission has actually been submitted and then adding a
call to it before displaying the the assignment submission date header

As recommended I've simplified the functions and split the logic out into appropriate upload classes.
 2012-02-20 11:34:38 +08:00
Sam Hemelryk
22fbfa3b2f Merge branch 'master_MDL-31397' of git://github.com/danmarsden/moodle 2012-02-20 16:03:19 +13:00
Sam Hemelryk
26fad611da Merge branch 'master_MDL-31652' of git://github.com/danmarsden/moodle 2012-02-20 15:57:12 +13:00
Sam Hemelryk
9405721002 Merge branch 'master_MDL-31659' of git://github.com/danmarsden/moodle 2012-02-20 15:49:41 +13:00
Sam Hemelryk
3cb4c1e594 Merge branch 'MDL-30965-master' of git://github.com/ankitagarwal/moodle 2012-02-20 15:46:46 +13:00
Sam Hemelryk
398f16fe0f MDL-31014 Integrated 2012-02-20 15:39:11 +13:00
Sam Hemelryk
284814724b Merge branch 'MDL-31014-master-3' of git://git.luns.net.uk/moodle 2012-02-20 15:38:32 +13:00
Sam Hemelryk
8f9c818604 Merge branch 'MDL-31589-master-2' of git://git.luns.net.uk/moodle 2012-02-20 15:17:39 +13:00
Sam Hemelryk
22bd2b93e5 Merge branch 'MDL-31556' of git://github.com/rwijaya/moodle 2012-02-20 12:39:12 +13:00
Sam Hemelryk
6dce4aa1ba Merge branch 'MDL-31647-master' of git://github.com/sammarshallou/moodle 2012-02-20 12:03:32 +13:00
Sam Hemelryk
9fdd4f7dc8 Merge branch 'wip-MDL-30971-master' of git://github.com/phalacee/moodle 2012-02-20 11:37:59 +13:00
sam marshall
f5f19eb70e MDL-31647 Glossary: Links to glossary entries from glossary main page should not be popups 2012-02-17 10:36:18 +00:00
Dan Marsden
1c6df63d5c SCORM MDL-31381 decrease max width of TOC to prevent SCORM content from being hidden, remove padding from pop-up and improve maxheight calculation 2012-02-17 17:14:12 +13:00
Ankit Agarwal
d6ae6816d0 MDL-30965 SCORM Removing unused variable ->head 2012-02-17 08:46:45 +05:30
Dan Marsden
6a3f2ad229 MDL-31659 SCORM remove old file and reference to it - it hasn't been used since the rework of SCORM player in MDL-22951 2012-02-17 15:29:36 +13:00
Dan Marsden
9e93f995dc SCORM MDL-31397 - add slashes to js string 2012-02-17 15:22:52 +13:00
Joseph Rezeau
608ba9fffb MDL-31556 Lesson Module: fixed missing 'lesson closes' event in calendar 2012-02-16 16:08:15 +08:00
Sam Hemelryk
889860576a Merge branch 'm_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle 2012-02-16 15:38:05 +13:00
Sam Hemelryk
1609f3cf7c Revert "MDL-30935_in_lti_change_role_from_instructor_to_teacher" 
This reverts commit 0758f991b36bdccb429b08a05ccbafe1d7ad977d.
 2012-02-16 15:37:57 +13:00
Gerard (Gerry) Caulfield
72ed614c74 MDL-30935_in_lti_change_role_from_instructor_to_teacher 2012-02-16 10:23:22 +08:00
Eloy Lafuente (stronk7)
ec93cd94e8 Merge branch 's17_MDL-30984_comment_docblock_master' of git://github.com/dongsheng/moodle 2012-02-16 02:07:48 +01:00
Dan Marsden
8aba9cda72 MDL-31652 SCORM - hide updatefreq setting and remove it if not required. 2012-02-16 12:16:02 +13:00
Jason Fowler
13d1c9ed55 MDL-30991 - RSS - Doc-block clean up 2012-02-15 15:19:59 +08:00
Dongsheng Cai
35453657a2 MDL-30984 comment API, check and update DocBlock 2012-02-15 11:21:35 +08:00
Eloy Lafuente (stronk7)
746aa0ba16 Merge branch 'MDL-31386-master-1' of git://git.luns.net.uk/moodle 2012-02-15 03:14:58 +01:00
Sam Hemelryk
e4082c4bad MDL-30709 mod_assignment: Renamed callback to mod_assignment_get_file_info 2012-02-15 11:26:49 +13:00
Aparup Banerjee
aad69d8b1a Merge branch 'wip-mdl-28101' of git://github.com/rajeshtaneja/moodle 2012-02-14 15:38:43 +08:00
Sam Hemelryk
b7bf2c3a19 Merge branch 'MDL-30911' of git://github.com/rwijaya/moodle 2012-02-14 17:41:55 +13:00
Sam Hemelryk
49414a7746 MDL-30709 mod_assignment Fixed phpdocs for assignment_get_file_info 2012-02-14 17:15:17 +13:00
Sam Hemelryk
d88f6dafdc Merge branch 'wip-MDL-30709-master' of git://github.com/marinaglancy/moodle 2012-02-14 17:14:05 +13:00
Sam Hemelryk
928c3d54e6 Merge branch 'm_MDL-27285_fixing_grammar_on_wiki_links_page' of git://github.com/gerrywastaken/moodle 2012-02-14 15:29:17 +13:00
Sam Hemelryk
9fd088b792 Merge branch 'm_MDL-30935_lti_change_instructor_role_to_teacher' of git://github.com/gerrywastaken/moodle 2012-02-14 15:12:09 +13:00
Sam Hemelryk
24768e4658 Merge branch 'm_MDL-31107_fixing_below_typos' of git://github.com/gerrywastaken/moodle 2012-02-14 15:07:57 +13:00
Sam Hemelryk
0b07d7d4b8 Merge branch 'MDL-30815-master' of git://github.com/ankitagarwal/moodle 2012-02-14 13:45:04 +13:00
Eloy Lafuente (stronk7)
35d8759a05 Merge branch 'MDL-30975' of git://github.com/ankitagarwal/moodle 2012-02-14 00:53:09 +01:00
Sam Hemelryk
caec8e44c0 Merge branch 'MDL-31515-master-1' of git://git.luns.net.uk/moodle 2012-02-14 10:56:27 +13:00
Andrew Robert Nicols
b9e7d8925e MDL-31589 Sort order of lesson answers before restoring them 2012-02-13 10:12:08 +00:00
Ankit Kumar Agarwal
04252d3a13 MDL-30975 Docs Adding correct pacakge information 2012-02-13 11:06:47 +05:30
Sam Hemelryk
2ac8cf7a20 Merge branch 'm_MDL-29153_fix_typo_in_resource' of git://github.com/gerrywastaken/moodle 2012-02-13 18:04:18 +13:00
Sam Hemelryk
ac87f25829 Merge branch 'wip-MDL-25185-master' of git://github.com/abgreeve/moodle 2012-02-13 17:34:50 +13:00
Sam Hemelryk
f9fea1dbc4 Merge branch 'wip-MDL-31396-master' of git://github.com/abgreeve/moodle 2012-02-13 17:15:56 +13:00
Rossiani Wijaya
e481859f6b MDL-30911: mod_lesson: fix sub-heading level to be lower than lesson title. This issue is an improvement of accessibility compliance 2012-02-13 11:26:27 +08:00
Ankit Agarwal
546a3f8130 MDL-30815 Choice Labels are now explicitly tied with input elements 2012-02-13 08:26:45 +05:30
Rajesh Taneja
b7c3ab01c4 MDL-28101 wiki2.0: escape bold and italics for NWIKI formatting 2012-02-13 10:28:07 +08:00
Sam Hemelryk
ea5ce02579 Merge branch 'MDL-31554' of git://github.com/timhunt/moodle 2012-02-13 15:26:06 +13:00
Sam Hemelryk
645573cab3 Merge branch 'MDL-25883-master' of https://github.com/mackensen/moodle 2012-02-13 14:35:19 +13:00
Gerard (Gerry) Caulfield
ce8df92df1 MDL-31107 Fixing instaces of below where it is written as bellow (two L's) 2012-02-10 15:40:04 +08:00
Gerard (Gerry) Caulfield
0758f991b3 MDL-30935_in_lti_change_role_from_instructor_to_teacher 2012-02-10 10:23:42 +08:00