mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-16 05:30:06 +01:00
Code Issues Projects Releases Wiki Activity
50,240 Commits 36 Branches 527 Tags
Commit Graph

11339 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
f71e41691a Merge branch 'MDL-30182' of git://github.com/timhunt/moodle 2011-11-17 10:53:56 +01:00
Tim Hunt
0850e6301a MDL-30182 fix missing include. Sorry. 2011-11-17 08:02:20 +00:00
Sam Hemelryk
b750c6b388 Merge branch 'MDL-24577-master-1' of git://git.luns.net.uk/moodle 2011-11-17 14:53:38 +13:00
Eloy Lafuente (stronk7)
1f40b7e252 Merge branch 'MDL-29743' of git://github.com/timhunt/moodle 2011-11-17 01:22:22 +01:00
Eloy Lafuente (stronk7)
d647c2d608 Merge branch 'MDL-30069' of git://github.com/timhunt/moodle 2011-11-17 00:45:00 +01:00
Eloy Lafuente (stronk7)
e929eb0353 Merge branch 'MDL-30122' of git://github.com/timhunt/moodle 2011-11-17 00:33:54 +01:00
Eloy Lafuente (stronk7)
e5bac3491a Merge branch 'MDL-30182' of git://github.com/timhunt/moodle 2011-11-17 00:18:25 +01:00
Eloy Lafuente (stronk7)
7f8dc336aa Merge branch 'MDL-30209' of git://github.com/timhunt/moodle 2011-11-17 00:02:02 +01:00
Nadav Kavalerchik
7a25d39873 MDL-27516 Several CSS fixes for right to left languages 2011-11-17 11:42:12 +13:00
Eloy Lafuente (stronk7)
2fee72e19b Merge branch 'MDL-30275-master' of git://github.com/sammarshallou/moodle 2011-11-16 21:29:25 +01:00
Ankit Kumar Agarwal
63a1625d78 MDL-30279 SCORM Fixing sql errors during cron 2011-11-16 09:47:00 +05:30
sam marshall
24ad1d1feb MDL-30275 Assignment activity description not displayed on course page 2011-11-15 15:24:08 +00:00
Tim Hunt
08502b574d MDL-30182 quiz grade.php should support userid param. 2011-11-15 11:36:10 +00:00
Tim Hunt
7238cd2ef0 MDL-30209 quiz refers to wrong rendere method in two places. 
Thanks to Dan Marsden for working out the fix.
 2011-11-15 11:23:03 +00:00
Tim Hunt
94c0ec2159 MDL-30185 question engine reporting: add redundant where to query for perf. 
Without this, MySQL fails to cope.
 2011-11-15 11:19:15 +00:00
Tim Hunt
5cc021a00b MDL-30069 Question type icons missing in lots of places. 2011-11-15 11:17:18 +00:00
Tim Hunt
cb1564b1ce MDL-29743 quiz: Finish attempt link didn't save responses in some brosers. 
Thanks to Brandon Browning for identifying the problem. It is quite subtle why this typo would have this effect. You need to look at the implementation of the preventDefault method in lib/yui/3.4.1/build/event-base/event-base.js.
 2011-11-15 11:10:51 +00:00
Eloy Lafuente (stronk7)
8d78644bcc Merge branch 'lti' of git://github.com/scriby/moodle 2011-11-14 12:37:43 +01:00
Eloy Lafuente (stronk7)
6a7998f9a1 MDL-20534 lti: bump version and requires to current before integration, yay! 2011-11-14 12:35:52 +01:00
Sam Hemelryk
1ae9aa2b8f Merged MDL-29108 Advanced grading 2011-11-14 22:01:05 +13:00
Dan Marsden
9a68ff24d2 MDL-27036 AICC HACP handling - add missing check for correct user with has_capability. 2011-11-14 21:20:14 +13:00
Marina Glancy
3c2b3cb3ee MDL-29108: added comments, declared functions visibility, renamed variables; also fixed MDL-30240 2011-11-14 14:53:14 +08:00
Chris Scribner
42a2c7f16e MDL-20534 lti: A8. Removing locallib.php require from lib.php 2011-11-11 13:54:54 -05:00
Chris Scribner
2575332b86 MDL-20534 lti: Updating call to lti_add_instance with 2nd argument. 2011-11-11 13:47:53 -05:00
Chris Scribner
d00d058d55 MDL-20534 lti: Fixing some language in lti's index.php 2011-11-11 13:40:59 -05:00
Chris Scribner
78d52bf87c MDL-20534 lti: Getting rid of references to "Basic" LTI in language file 2011-11-11 13:34:24 -05:00
Chris Scribner
89b7bbe9ee MDL-20534 lti: A9. Fixing issues with the course tool popup not disappearing. 2011-11-11 13:31:09 -05:00
Darko Miletic
4febc0a013 Added Moodle 1.9 -> Moodle 2 converter 2011-11-11 08:31:34 -05:00
David Mudrak
a3b37e4b6e MDL-29483 The capability to manage grading forms can be overridden at the Assignment module level 2011-11-11 13:59:04 +01:00
Aparup Banerjee
6cf8f401ba MDL-27037 wiki : fixed whitespace. 2011-11-11 13:28:46 +08:00
Mayank Gupta
dc0cabb488 MDL-27037, wiki does not support visiblegroups functionality 2011-11-11 13:28:41 +08:00
Eloy Lafuente (stronk7)
8ac9d33f49 Merge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	lib/db/upgrade.php
	report/completion/index.php
	report/progress/index.php
	version.php
 2011-11-11 03:37:55 +01:00
Stephen Bourget
8c93ab4e0f MDL-29529 Assignment: Fix regression caused by MDL-27638 2011-11-11 01:23:47 +01:00
Eloy Lafuente (stronk7)
d59df6582b Merge branch 'MDL-29808' of git://github.com/timhunt/moodle 
Conflicts:
	question/type/upgrade.txt

There were already one just added upgrade.txt file so this ended
conflicting. Reviewed the contents, I've deleted the less detailed
note about pluginname, leaving the longer description added by Tim.

Ciao :-)
 2011-11-10 21:54:36 +01:00
Tim Hunt
646791794d MDL-29808 qformats: use standard pluginname string and add version.php 
AMOS BEGIN
 MOV [aiken,qformat_aiken],[pluginname,qformat_aiken]
 MOV [aiken_help,qformat_aiken],[pluginname_help,qformat_aiken]
 MOV [aiken_link,qformat_aiken],[pluginname_link,qformat_aiken]
 MOV [blackboard,qformat_blackboard],[pluginname,qformat_blackboard]
 MOV [blackboard_help,qformat_blackboard],[pluginname_help,qformat_blackboard]
 MOV [blackboard_six,qformat_blackboard_six],[pluginname,qformat_blackboard_six]
 MOV [blackboard_six_help,qformat_blackboard_six],[pluginname_help,qformat_blackboard_six]
 MOV [examview,qformat_examview],[pluginname,qformat_examview]
 MOV [examview_help,qformat_examview],[pluginname_help,qformat_examview]
 MOV [gift_help,qformat_gift],[pluginname_help,qformat_gift]
 MOV [gift_link,qformat_gift],[pluginname_link,qformat_gift]
 MOV [learnwise,qformat_learnwise],[pluginname,qformat_learnwise]
 MOV [learnwise_help,qformat_learnwise],[pluginname_help,qformat_learnwise]
 MOV [missingword,qformat_missingword],[pluginname,qformat_missingword]
 MOV [missingword_help,qformat_missingword],[pluginname_help,qformat_missingword]
 MOV [missingword_link,qformat_missingword],[pluginname_link,qformat_missingword]
 MOV [multianswer,qformat_multianswer],[pluginname,qformat_multianswer]
 MOV [multianswer_help,qformat_multianswer],[pluginname_help,qformat_multianswer]
 MOV [multianswer_link,qformat_multianswer],[pluginname_link,qformat_multianswer]
 MOV [webct_help,qformat_webct],[pluginname_help,qformat_webct]
 MOV [webct_link,qformat_webct],[pluginname_link,qformat_webct]
 MOV [xhtml,qformat_xhtml],[pluginname,qformat_xhtml]
 MOV [xhtml_help,qformat_xhtml],[pluginname_help,qformat_xhtml]
 MOV [xhtml_link,qformat_xhtml],[pluginname_link,qformat_xhtml]
 MOV [xml_help,qformat_xml],[pluginname_help,qformat_xml]
 MOV [xml_link,qformat_xml],[pluginname_link,qformat_xml]
AMOS END
 2011-11-10 19:12:28 +00:00
Eloy Lafuente (stronk7)
8f1a0d21cb MDL-28277 scorm report - set interaction as standard + version component 2011-11-10 16:55:54 +01:00
Eloy Lafuente (stronk7)
f3bf5eba51 Merge branch 'MDL-30145' of git://github.com/timhunt/moodle 2011-11-10 00:25:45 +01:00
Eloy Lafuente (stronk7)
ff64599f25 Merge branch 'w44_MDL-29897_m22_upgradetxt' of git://github.com/skodak/moodle 2011-11-09 16:35:57 +01:00
Eloy Lafuente (stronk7)
b5b99e0b7a NOBUG: Whitespace fixes 2011-11-09 16:32:30 +01:00
Aparup Banerjee
b965ee236c Merge branch 'MDL-29620-workshop-sequence' of git://github.com/mudrd8mz/moodle 2011-11-09 17:55:04 +08:00
Eloy Lafuente (stronk7)
c4bdf6b2d4 Merge branch 'w44_MDL-30151_m22_initialforumsubscribe' of git://github.com/skodak/moodle 2011-11-09 10:05:40 +01:00
Eloy Lafuente (stronk7)
7654b7bbc1 Merge branch 'MDL-28277-master' of git://github.com/ankitagarwal/moodle 2011-11-09 09:43:18 +01:00
Ankit Kumar Agarwal
f9ab70a908 MDL-28277 Changing optional_param to optional_param_array 2011-11-09 13:29:26 +05:30
Dan Poltawski
39b7715099 MDL-29696 mod/data - fixed page continuing after footer. 2011-11-09 15:42:07 +08:00
Eloy Lafuente (stronk7)
b7830daba1 Merge branch 'master_MDL-29159' of git://github.com/danmarsden/moodle 2011-11-09 02:20:26 +01:00
Eloy Lafuente (stronk7)
0a9ed36c9e Merge branch 'master_MDL-30146' of git://github.com/danmarsden/moodle 2011-11-09 02:13:38 +01:00
Eloy Lafuente (stronk7)
ec25a72c4d Merge branch 'master_MDL-27036' of git://github.com/danmarsden/moodle 2011-11-09 02:03:25 +01:00
Eloy Lafuente (stronk7)
df087b865b Merge branch 'master_MDL-30041' of git://github.com/danmarsden/moodle 2011-11-09 01:34:08 +01:00
Eloy Lafuente (stronk7)
e7ec46fc59 MDL-28277 SCORM some whitespace and MOODLE_INTERNAL fixes 2011-11-09 01:30:51 +01:00
Eloy Lafuente (stronk7)
253b3231b9 Merge branch 'MDL-28277-master' of git://github.com/ankitagarwal/moodle 2011-11-09 01:20:06 +01:00