Aparup Banerjee
8b042b1cc8
Merge branch 'MDL-37583' of git://github.com/timhunt/moodle
2013-01-22 11:37:24 +08:00
Sam Hemelryk
59573bb447
MDL-36621 calendar: fixed up conflict error
2013-01-22 16:35:48 +13:00
Sam Hemelryk
36546841f1
Merge branch 'MDL-36621-master' of git://github.com/ankitagarwal/moodle
...
Conflicts:
calendar/lib.php
lib/db/caches.php
version.php
2013-01-22 16:35:03 +13:00
Dan Poltawski
68a6d87684
Merge branch 'MDL-37473' of git://github.com/srynot4sale/moodle
2013-01-22 11:14:19 +08:00
Dan Poltawski
c9ae6d3c27
Merge branch 'MDL-17812' of git://github.com/timhunt/moodle
2013-01-22 11:11:53 +08:00
Aparup Banerjee
60f95aad6c
Merge branch 'MDL-37585' of git://github.com/timhunt/moodle
2013-01-22 11:08:16 +08:00
Aparup Banerjee
c0038fbe5b
Merge branch 'MDL-37540-master' of git://github.com/damyon/moodle
2013-01-22 10:59:26 +08:00
Aparup Banerjee
5d4183b94f
Merge branch 'MDL-37543-master' of git://github.com/damyon/moodle
2013-01-22 10:56:06 +08:00
Marina Glancy
1d3791018b
MDL-37541 Wikimedia allows to resize found images
2013-01-22 13:48:59 +11:00
Marina Glancy
df8b1e7358
MDL-37541 Wikimedia returns more information about images
2013-01-22 13:41:38 +11:00
Eloy Lafuente (stronk7)
cccdddf241
Merge branch 'MDL-37539-master' of github.com:damyon/moodle
2013-01-22 02:11:27 +01:00
Dan Poltawski
22aabad2d8
Merge branch 'MDL-37358-master' of git://github.com/mouneyrac/moodle
2013-01-22 09:05:46 +08:00
Damyon Wiese
f518843d4c
MDL-37539 assign: Fix unit test after changes to upgrade for advanced file assignments.
2013-01-22 09:04:13 +08:00
Eloy Lafuente (stronk7)
0aaf378cf9
Merge branch 'MDL-36104_master' of https://github.com/markn86/moodle
2013-01-22 01:11:48 +01:00
Eloy Lafuente (stronk7)
17f394f81a
Merge branch 'MDL-37539-master' of github.com:damyon/moodle
2013-01-22 01:05:54 +01:00
Eloy Lafuente (stronk7)
29a4621e47
Merge branch 'MDL-28512' of git://github.com/timhunt/moodle
2013-01-22 01:02:12 +01:00
Eloy Lafuente (stronk7)
6501e6e037
Merge branch 'wip-mdl-37432' of git://github.com/rajeshtaneja/moodle
2013-01-22 00:52:42 +01:00
Eloy Lafuente (stronk7)
37027f431b
Merge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle
2013-01-21 23:26:35 +01:00
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
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
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