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

51520 Commits

This Branch
This Branch
All Branches
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
a77fbf44da Merge branch 'MDL-31432_messaging_popup' of git://github.com/andyjdavis/moodle 2012-02-20 16:58:36 +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
1498035f37 Merge branch 'MDL-31590-master-1' of git://git.luns.net.uk/moodle 2012-02-20 15:01:19 +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
06749fde07 Merge branch 'MDL-30495' of git://github.com/mouneyrac/moodle 2012-02-20 11:50:56 +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 Hemelryk
bc5fbbb3cd Merged branch wip-MDL-30521 with conflict resolutions 2012-02-20 10:32:08 +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
sam marshall
d9498b3805 MDL-31514 Lib: Time format to remove unwanted zeros caused errors on Windows servers 2012-02-17 10:33:07 +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
Andrew Davis
762677611a MDL-31432 message: prevent messaging popups while viewing messages 2012-02-17 09:23:48 +07:00
Dan Marsden
9e93f995dc SCORM MDL-31397 - add slashes to js string 2012-02-17 15:22:52 +13:00
Eloy Lafuente (stronk7)
0dde394db5 weekly release 2.3dev 2012-02-17 01:47:10 +01:00
Eloy Lafuente (stronk7)
d764c275f2 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-02-17 01:43:19 +01:00
AMOS bot
a97d4da684 Automatically generated installer lang files 2012-02-17 00:31:10 +00:00
Eloy Lafuente (stronk7)
3360b13bac MDL-31251 documentation : fix incorrect docs 2012-02-16 17:59:02 +01: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
Jerome Mouneyrac
dcd902a0f6 MDL-30495 HTML5 apps cannot call Webservices functions if a HTTP resource is retrieved from the Moodle installation 2012-02-15 11:33:11 +08:00
Aparup Banerjee
9906cf41ab Merge branch 'MDL-31114_dnd_ui_improvements' of https://github.com/davosmith/moodle 2012-02-15 11:32:32 +08:00
Sam Hemelryk
be09c3f392 MDL-30888 course-search: Fixed typo 2012-02-15 16:28:44 +13:00
Sam Hemelryk
051806b2ee Merge branch 'wip-mdl-30388' of git://github.com/rajeshtaneja/moodle 2012-02-15 16:23:57 +13:00
Dongsheng Cai
35453657a2 MDL-30984 comment API, check and update DocBlock 2012-02-15 11:21:35 +08:00
Sam Hemelryk
18cdcdbf89 MDL-30989 portfolio: Fixed up phpdocs 2012-02-15 15:33:06 +13:00
Sam Hemelryk
9e7ff1476c Merge branch 'MDL-30989' of git://github.com/rwijaya/moodle 2012-02-15 15:32:16 +13:00
Eloy Lafuente (stronk7)
1991f37f55 Merge branch 'm_MDL-31552_change_add_to_log_exception_to_add_exception_information' of git://github.com/gerrywastaken/moodle 2012-02-15 03:19:44 +01: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
Rajesh Taneja
f53f582dc6 MDL-30388 Blocks: navigation block is visible on block search page 2012-02-15 10:14:50 +08:00
Rajesh Taneja
cf5b731c9c MDL-30388 Blocks: Search view for block instances fixed, with proper page url and pagination 2012-02-15 10:14:49 +08:00
AMOS bot
8150fd9fa5 Automatically generated installer lang files 2012-02-15 00:31:12 +00:00
Sam Hemelryk
1ddb08084b MDL-31112 repository: Fixed phpdocs on new function 2012-02-15 12:44:32 +13:00
Sam Hemelryk
f820701286 Merge branch 'MDL-31112_dndupload_folder_detection' of git://github.com/davosmith/moodle 2012-02-15 12:41:47 +13:00
Sam Hemelryk
e4082c4bad MDL-30709 mod_assignment: Renamed callback to mod_assignment_get_file_info 2012-02-15 11:26:49 +13:00