Commit graph

58916 commits

Author SHA1 Message Date
Sam Hemelryk
0774b0d34c Merge branch 'MDL-37563-master' of git://github.com/damyon/moodle 2013-01-22 09:10:44 +13:00
Eloy Lafuente (stronk7)
fa669c49ad Merge branch 'w03_MDL-36411_m25_setup' of git://github.com/skodak/moodle 2013-01-21 20:08:12 +01:00
Eloy Lafuente (stronk7)
ea4edbd6bc Merge branch 'MDL-37577' of git://github.com/timhunt/moodle 2013-01-21 20:01:39 +01:00
Eloy Lafuente (stronk7)
6ee4df92ab Merge branch 'MDL-35924_master' of https://github.com/markn86/moodle 2013-01-21 19:41:45 +01:00
Eloy Lafuente (stronk7)
509c2758ce Merge branch 'MDL-34050' of git://github.com/rwijaya/moodle 2013-01-21 16:47:18 +01:00
Tim Hunt
805e32f74e MDL-37577 quiz overdue handling: optimise database query
This is the standard trick of adding a redundant WHERE clause to a
subquery to help the database realise that it does not have to inspect
so many rows.
2013-01-21 13:21:38 +00:00
Tim Hunt
b5d09003bb MDL-37599 question import: add missing string.
AMOS BEGIN
 MOV [matcherror,question],[invalidgrade,question]
AMOS END
2013-01-21 12:07:47 +00:00
Aparup Banerjee
5650cdb8fc Merge branch 'wip-MDL-37541-master' of git://github.com/marinaglancy/moodle 2013-01-21 17:06:09 +08:00
Tim Hunt
74fa94b26a MDL-37585 Make $DB->set_debug(true) show run time of each query. 2013-01-21 08:48:15 +00:00
Petr Škoda
1764cd8e6f MDL-37593 use https for editor script if required 2013-01-21 09:40:15 +01:00
Michael de Raadt
25784512cd MDL-35357 Lesson Module: fixed undefined property for $answerformat 2013-01-21 15:35:39 +08:00
Aparup Banerjee
93c62e0cd8 Merge branch 'w03_MDL-37559_m25_otherusers' of git://github.com/skodak/moodle 2013-01-21 15:26:13 +08:00
Aparup Banerjee
4e0828c954 Merge branch 'MDL-37571' of git://github.com/tmuras/moodle 2013-01-21 15:05:46 +08:00
Rossiani Wijaya
d264e5d72c MDL-37375 Report: fixed blog post link from course activity report 2013-01-21 14:59:23 +08:00
Marina Glancy
ebe9d4965d MDL-37541 Wikimedia returns more information about images 2013-01-21 17:30:10 +11:00
Mark Nelson
7e5be0744c MDL-36104 mod_assign: added hidden labels to the feedback input fields 2013-01-21 12:50:34 +08:00
Aparup Banerjee
ebf5d99c61 Merge branch 'wip-MDL-37591_master' of git://github.com/lazydaisy/moodle 2013-01-21 12:49:15 +08:00
Aparup Banerjee
410fee1239 Merge branch 'wip-MDL-37592_master' of git://github.com/lazydaisy/moodle 2013-01-21 12:38:13 +08:00
Andrew Davis
245d1d28c2 MDL-37352 core_grade:fixed some ajax display issues 2013-01-21 12:27:44 +08:00
Rossiani Wijaya
cdc018ad2d MDL-19069 RSS feed block: Removed link for remote RSS feeds on navigation 2013-01-21 11:56:42 +08:00
Ankit Agarwal
c66dc3dff5 MDL-37101 webservices: Define ws api core_calendar_create_calendar_events 2013-01-21 11:53:33 +08:00
Dan Poltawski
77ea8340de Merge branch 'MDL-37458_master' of git://github.com/dmonllao/moodle 2013-01-21 11:14:38 +08:00
Ankit Agarwal
793d38552a MDL-37100 webservices: Define core_calendar_get_calendar_events() api 2013-01-21 11:05:50 +08:00
Ankit Agarwal
261a41f16d MDL-37100 webservices: Adding warnings and cleaning up get_calendar_events() api 2013-01-21 11:05:50 +08:00
Ankit Agarwal
7c30224aeb MDL-37100 webservices: PHPunit tests for core_calendar_get_calendar_events() 2013-01-21 11:05:50 +08:00
Ankit Agarwal
475896bdbc MDL-37100 webservices: Implement core_calendar_get_calendar_events() 2013-01-21 11:05:50 +08:00
Dan Poltawski
73ce4ac996 Merge branch 'MDL-37457_master' of git://github.com/dmonllao/moodle 2013-01-21 10:53:12 +08:00
Rajesh Taneja
f40c37d005 MDL-37432 Calendar: If Calendar url is invalid then remove invalid subscription 2013-01-21 10:46:19 +08:00
Rajesh Taneja
378cb038b2 MDL-37432 Calendar: Added check for empty calendar url 2013-01-21 10:28:32 +08:00
Dan Poltawski
b77cce5c5c Merge branch 'MDL-30769_iframe' of git://github.com/rwijaya/moodle 2013-01-21 10:25:42 +08:00
Dan Poltawski
be576cb0e8 Merge branch 'wip-mdl-36674' of git://github.com/rajeshtaneja/moodle 2013-01-21 10:15:16 +08:00
Dan Poltawski
2073bb7632 Merge branch 'MDL-35074_master_2' of git://github.com/pauln/moodle 2013-01-21 10:07:43 +08:00
Dan Poltawski
66bfd52a62 Merge branch 'MDL-37527-master' of github.com:damyon/moodle 2013-01-21 10:03:34 +08:00
Dan Poltawski
94abbef12f Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle 2013-01-21 09:59:35 +08:00
Dan Poltawski
2f61796c26 Merge branch 'w03_MDL-36809_m25_mysqlipers' of git://github.com/skodak/moodle 2013-01-21 09:04:57 +08:00
Dan Poltawski
3be10301e9 Merge branch 'master_MDL-36421' of git://github.com/danmarsden/moodle 2013-01-21 09:01:00 +08:00
AMOS bot
18ec2dcd40 Automatically generated installer lang files 2013-01-21 00:44:52 +00:00
Mary Evans
ac6efbaf22 MDL-37592 admin/toot/xmldb/actions/: changed all instances of generalbox class to generaltable class in twelve files as listed. 2013-01-20 22:23:53 +00:00
Mary Evans
01e34f156a MDL-37591 admin/mnet: replaced generalbox class with generaltable 2013-01-20 21:52:09 +00:00
Sam Hemelryk
528d2633df Merge branch 'MDL-37295-master' of git://github.com/ankitagarwal/moodle 2013-01-21 10:18:33 +13:00
Sam Hemelryk
11a5fab670 Merge branch 'MDL-35817' of git://github.com/rwijaya/moodle 2013-01-21 09:47:00 +13:00
Andrew Davis
40fcc26189 MDL-36757 course: avoid accidently overwriting the hidden/visible values set on grade items 2013-01-21 09:33:02 +13:00
ppichet
c2ba17858c MDL-33105 flexible apply_units() function
Allow use of thousands separator as long as the decimal separator
is used in the number.
2013-01-19 15:36:31 -05:00
Petr Škoda
00c269db37 MDL-37559 fix display of multiple roles of other users
Credit goes to Tyron Delean, thanks.
2013-01-19 16:50:38 +01:00
Petr Škoda
9dcae46d93 MDL-36602 support mnethostid in user csv upload tool
Remote users can not be created, updated or deleted. The only allowed operations are suspending, enrolling and adding to cohort or group.
2013-01-19 13:27:00 +01:00
Petr Škoda
33b5b9f97a MDL-36809 add support for mysqli persistent connections 2013-01-19 13:25:28 +01:00
Petr Škoda
6a8e467916 MDL-36411 make sure asserts in setUp() do not cause problems 2013-01-19 13:19:49 +01:00
Petr Škoda
c7a3399041 MDL-37257 improve enrol overview page and enrol plugin info 2013-01-19 13:14:41 +01:00
ppichet
1649a4f7ea MDL-29691 Improve numerical format in multianswer
Allow the use of , as decsep in multianswer numerical subquestions
2013-01-18 21:48:56 -05:00
Tim Hunt
b4cb095798 MDL-17812 shortanswer qtype: rename DB stuff to match coding guidelines.
We should be leading by example in Moodle core.
2013-01-18 15:53:35 +00:00