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

51692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
ceaad88222 Merge branch 'wip-mdl-30974' of git://github.com/rajeshtaneja/moodle 2012-02-21 12:07:30 +13:00
Sam Hemelryk
56588dfbee MDL-30988 Fixed phpdocs during integration review 2012-02-21 12:01:00 +13:00
Sam Hemelryk
26aca872ca Merge branch 'm_MDL-30988_adding_preference_api_phpdocs' of git://github.com/gerrywastaken/moodle 2012-02-21 11:59:48 +13:00
Sam Hemelryk
e6e4fe4f43 Merge branch 'MDL-29402-master' of https://github.com/mackensen/moodle 2012-02-21 10:44:00 +13:00
Sam Hemelryk
da3ec93275 Merged branch 'MDL-31014-master-4' of git://git.luns.net.uk/moodle.git with conflict resolution 2012-02-21 10:33:00 +13:00
Eloy Lafuente (stronk7)
6ff5994b49 Merge branch 'MDL-19421-master-3' of git://git.luns.net.uk/moodle 2012-02-20 17:11:22 +01:00
Andrew Robert Nicols
ab48e73159 MDL-19421 Correct lesson dependency mapping on restore 2012-02-20 14:56:02 +00:00
Eloy Lafuente (stronk7)
9cd8e48ca6 Merge branch 'MDL-31345_master' of git://github.com/lazydaisy/moodle 2012-02-20 15:34:31 +01:00
Andrew Robert Nicols
bca2b1c157 MDL-31014 Allow for selection of a different displayformat when approving glossary entries 2012-02-20 12:28:52 +00:00
Eloy Lafuente (stronk7)
d03a130455 Merge branch 'wip-MDL-25299-m23' of git://github.com/samhemelryk/moodle 2012-02-20 12:58:54 +01:00
Eloy Lafuente (stronk7)
11ce79b05d MDL-30999 whitespace fix 2012-02-20 12:17:33 +01:00
Eloy Lafuente (stronk7)
a4d7604977 MDL-30999 grade phpdocs - change some inline @see by correct @link 2012-02-20 12:09:50 +01:00
Eloy Lafuente (stronk7)
2a5fa9e64a Merge branch 'MDL-30999_grade_phpdocs' of git://github.com/andyjdavis/moodle 2012-02-20 12:02:18 +01:00
Eloy Lafuente (stronk7)
a0fbb0a270 Merge branch 'wip-MDL-30979-m23' of git://github.com/samhemelryk/moodle 2012-02-20 11:38:20 +01:00
Eloy Lafuente (stronk7)
47e5997851 MDL-30977 page phpdocs: 2 minor fixes in 2 functions 2012-02-20 11:28:08 +01:00
Eloy Lafuente (stronk7)
7dca125be4 Merge branch 'wip-MDL-30977-m23' of git://github.com/samhemelryk/moodle 2012-02-20 11:25:01 +01:00
Eloy Lafuente (stronk7)
ad360e66ae Merge branch 'MDL-30972_final' of git://github.com/nebgor/moodle 2012-02-20 11:20:21 +01:00
Sam Hemelryk
e76eba8111 Merge branch 'wip-mdl-29967' of git://github.com/rajeshtaneja/moodle 2012-02-20 18:20:37 +13:00
Sam Hemelryk
5f5ee19125 MDL-29254 Fixed whitespace 2012-02-20 18:08:33 +13:00
Sam Hemelryk
fcd6bdd4fa Merged MDL-29254 with conflict resolution 2012-02-20 18:07:13 +13:00
Sam Hemelryk
c2627cf429 Merge branch 'MDL-31483_master' of git://github.com/lazydaisy/moodle 2012-02-20 17:34:58 +13:00
Sam Hemelryk
5128ef6b45 Merge branch 'wip-MDL-30780-master' of git://github.com/marinaglancy/moodle 2012-02-20 17:29:47 +13:00
EVAN Irving-Pease
44ef537d8a MDL-28386 Authentication Fixing user id issue with logs when a new user is added 2012-02-20 09:56:31 +05:30
Sam Hemelryk
8e1b1b270b Merge branch 'wip-MDL-31627-master' of git://github.com/marinaglancy/moodle 2012-02-20 17:25:48 +13:00
Sam Hemelryk
b91c364ef3 Merge branch 'm_MDL-31388_fix_enrol_LDAP_typo' of git://github.com/gerrywastaken/moodle 2012-02-20 17:13:36 +13:00
Sam Hemelryk
841fcd871b Merge branch 'MDL-31532' of git://github.com/stronk7/moodle 2012-02-20 17:10:52 +13:00
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
Andrew Davis
fc28177f4d MDL-31335 message: wrapped calls to mtrace() in email_to_user() within a check to make sure its a CLI script 2012-02-20 10:30:02 +07: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
Rajesh Taneja
aa803ceba2 MDL-29254 blog: added check in upgrade for summary and content to be null fields 2012-02-20 09:33:20 +08:00
Rajesh Taneja
5f1f726e68 MDL-25432 backup: Catching exception for orphan course modules and it's block (if any), and logging them, no exception will be thrown for this now. 2012-02-20 09:28:55 +08:00
Eloy Lafuente (stronk7)
ee1dc83574 MDL-31532 restore: avoid null course->hiddensections problems. Credit goes to Petri Asikainen. Thanks! 2012-02-20 01:34:25 +01:00
AMOS bot
87e59a8f7d Automatically generated installer lang files 2012-02-20 00:31:15 +00: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
Mary Evans
55a573e5b0 MDL-31483_master theme_standard: Removed padding in custommenu item content and added line-height 2012-02-19 19:11:16 +00:00
AMOS bot
5db3b10bab Automatically generated installer lang files 2012-02-18 00:31:24 +00:00