moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58852 commits 37 branches 540 tags 1.3 GiB
Commit graph

58852 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
d7687c3a23 Merge branch 'w03_MDL-37257_m25_enrolsettings' of git://github.com/skodak/moodle 2013-01-22 15:37:36 +08:00
Dan Poltawski
bfaf3041fa Merge branch 'wip-mdl-32526' of git://github.com/rajeshtaneja/moodle 2013-01-22 14:00:26 +08:00
Aparup Banerjee
1a6192f928 Merge branch 'MDL-37547-master' of github.com:damyon/moodle 2013-01-22 13:57:25 +08:00
Ankit Agarwal
e6a1f8c102 MDL-37100 webservices: Adding warnings and cleaning up get_calendar_events() api 2013-01-22 13:54:49 +08:00
Jason Fowler
512edd65d8 MDL-35826 - Calendar - Creating a caption containing the month name for mini-calendars 2013-01-22 13:51:09 +08:00
Dan Poltawski
499e1f11a5 Merge branch 'MDL-36138-master' of git://github.com/StudiUM/moodle 2013-01-22 13:40:02 +08:00
Damyon Wiese
c1432fad2c MDL-37619 Assign: Fix failed unit tests for mod/assign/lib.php 
The failure was caused by a regression in MDL-37527.
 2013-01-22 13:34:01 +08:00
Dan Poltawski
5a4a346834 Merge branch 'MDL-33206-master' of git://github.com/StudiUM/moodle 2013-01-22 12:58:27 +08:00
Dan Poltawski
f6623fe130 Merge branch 'MDL-27164-master' of git://github.com/micaherne/moodle 2013-01-22 12:51:51 +08:00
Dan Poltawski
cba645b850 Merge branch 'master_MDL-36853' of git://github.com/danmarsden/moodle 2013-01-22 12:49:18 +08:00
Dan Poltawski
928639c06e Merge branch 'MDL-37275_master' of git://github.com/markn86/moodle 2013-01-22 12:46:09 +08:00
Dan Poltawski
8f43dfac3a Merge branch 'MDL-37375' of git://github.com/rwijaya/moodle 2013-01-22 12:43:47 +08:00
Dan Poltawski
011ee6742f Merge branch 'MDL-37426-m' of git://github.com/andrewnicols/moodle 2013-01-22 12:41:12 +08:00
Dan Poltawski
f5ba8b0f03 Merge branch 'w03_MDL-37593_m25_httpslogineditor' of git://github.com/skodak/moodle 2013-01-22 12:35:54 +08:00
Aparup Banerjee
447e59a1f2 Merge branch 'wip-MDL-37541-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	repository/wikimedia/wikimedia.php
 2013-01-22 12:10:48 +08:00
Dan Poltawski
8cd57fb26a Merge branch 'MDL-37430-master' of github.com:damyon/moodle 2013-01-22 11:53:10 +08:00
Dan Poltawski
ad0bcfe6a6 Merge branch 'MDL-35357' of git://github.com/rwijaya/moodle 2013-01-22 11:48:04 +08:00
Dan Poltawski
97d3e09cd8 Merge branch 'MDL-37599' of git://github.com/timhunt/moodle 2013-01-22 11:40:04 +08:00
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
Mark Nelson
d448625682 MDL-37414 blocks: re-added the ability to add some blocks to the My Moodle 2013-01-22 10:52:41 +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
Mary Evans
4c085aed64 MDL-37614 report/completion: changed generalbox class in table to generaltable class in user.php 2013-01-21 23:51:47 +00:00
Mary Evans
0434dd2482 MDL-37613 mod: changed generalbox class in table to generaltable class in mod/feedback (2 files);mod/glossary (3 files);mod/wiki (1 file). 2013-01-21 23:38:46 +00:00
Mary Evans
eb610eb90d MDL-37612 course: changed 1 instance of generalbox class to generaltable class in each of the following category.php, lib.php, search.php 2013-01-21 23:12:20 +00:00
Mary Evans
42d733dcdf MDL-37611 block/completionstatus: changed 2 insances of generalbox class to generaltable class in details.php 2013-01-21 22:51:37 +00: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