58513 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
0c198a1b59 Merge branch 'w02_MDL-37429_m25_zippacker' of git://github.com/skodak/moodle
Conflicts:
	lib/upgrade.txt
2013-01-16 02:22:26 +01:00
Eloy Lafuente (stronk7)
06d78e8209 Merge branch 'MDL-36257-master' of git://git.luns.net.uk/moodle 2013-01-16 02:05:27 +01:00
Eloy Lafuente (stronk7)
becb4de707 Merge branch 'w02_MDL-37019_m25_metadef' of git://github.com/skodak/moodle 2013-01-16 01:58:08 +01:00
Eloy Lafuente (stronk7)
a932fa439f MDL-35775 Whitespace fix. 2013-01-16 01:30:19 +01:00
Eloy Lafuente (stronk7)
91d5e08aa3 Merge branch 'MDL-35775-master' of git://github.com/micaherne/moodle 2013-01-16 01:28:53 +01:00
Eloy Lafuente (stronk7)
a91350609e Merge branch 'wip-MDL-34344-m25' of git://github.com/samhemelryk/moodle
Conflicts:
	lib/db/caches.php
2013-01-16 01:08:26 +01:00
Sam Hemelryk
3909faf45a MDL-23504 admin: fixed whitespace issue 2013-01-16 12:00:37 +13:00
Sam Hemelryk
e265716f69 Merge branch 'wip-mdl-23504' of git://github.com/rajeshtaneja/moodle 2013-01-16 11:06:39 +13:00
Sam Hemelryk
ec16ef1f85 Merge branch 'wip-MDL-35818-master' of git://github.com/phalacee/moodle 2013-01-16 11:03:39 +13:00
Sam Hemelryk
00ba185d52 Merge branch 'wip-MDL-36967-master' of git://github.com/marinaglancy/moodle
Conflicts:
	lib/deprecatedlib.php
2013-01-16 11:01:16 +13:00
Eloy Lafuente (stronk7)
d9b9d22fa1 Merge branch 'MDL-37173-m' of git://github.com/andrewnicols/moodle 2013-01-15 21:56:13 +01:00
Eloy Lafuente (stronk7)
493d8f781c Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle
Conflicts:
	message/tests/externallib_test.php
2013-01-15 21:50:31 +01:00
Eloy Lafuente (stronk7)
563bcc2322 Merge branch 'MDL-31726' of git://github.com/colchambers/moodle 2013-01-15 21:44:38 +01:00
Petr Škoda
3cb856c744 MDL-37429 document zip packer improvements 2013-01-15 20:45:36 +01:00
Eloy Lafuente (stronk7)
ee5c647e84 Merge branch 'MDL-31616' of git://github.com/timhunt/moodle 2013-01-15 20:14:03 +01:00
Eloy Lafuente (stronk7)
dcb21e6cc1 Merge branch 'wip-mdl-37062' of git://github.com/rajeshtaneja/moodle 2013-01-15 20:04:21 +01:00
Eloy Lafuente (stronk7)
fcdc9b7717 NOBUG: 1 more whitespace, was hurting my eyes all the time. 2013-01-15 19:20:17 +01:00
Eloy Lafuente (stronk7)
3af9d77c1d MDL-33117 Whitespace fixes 2013-01-15 19:09:57 +01:00
Eloy Lafuente (stronk7)
0943a0ce11 Merge branch 'MDL-34883_unit_tests' of git://github.com/andyjdavis/moodle 2013-01-15 18:21:12 +01:00
Eloy Lafuente (stronk7)
ceda80962c Merge branch 'MDL-37395-master' of git://github.com/sammarshallou/moodle 2013-01-15 18:17:12 +01:00
Eloy Lafuente (stronk7)
62a9604677 Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle 2013-01-15 18:12:20 +01:00
Eloy Lafuente (stronk7)
ada893d339 Merge branch 'MDL-36554' of git://github.com/rwijaya/moodle 2013-01-15 18:02:26 +01:00
Eloy Lafuente (stronk7)
dfcb38a1c7 Merge branch 'wip-MDL-37207-master' of git://github.com/marinaglancy/moodle 2013-01-15 18:00:17 +01:00
Dan Poltawski
a9081ce630 MDL-37313 question: fix trailing whitespace 2013-01-15 16:36:14 +08:00
Dan Poltawski
12576d356a Merge branch 'MDL-37313' of git://github.com/jmvedrine/moodle 2013-01-15 16:35:17 +08:00
Dan Poltawski
2773aa41de Merge branch 'MDL-30070-master' of git://github.com/FMCorz/moodle 2013-01-15 16:04:57 +08:00
Frederic Massart
d6731600c8 MDL-30070 message: Web Services for contact list 2013-01-15 16:04:00 +08:00
Frederic Massart
a03330bd16 MDL-30070 message: Optimised search for users over multiple courses 2013-01-15 15:15:47 +08:00
Dan Poltawski
d7738ce27c Merge branch 'MDL-36529' of git://github.com/colchambers/moodle 2013-01-15 14:55:18 +08:00
Dan Poltawski
864ff70c74 Merge branch 'MDL-36534' of git://github.com/timhunt/moodle 2013-01-15 14:44:28 +08:00
Dan Poltawski
a85d61e812 Merge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle 2013-01-15 14:32:22 +08:00
Dan Poltawski
2429051d2f Merge branch 'MDL-37381-master' of git://github.com/mouneyrac/moodle 2013-01-15 14:29:41 +08:00
David Monllao
7cd5340f05 MDL-28705 enrol_imsenterprise Quick unit tests fix 2013-01-15 14:24:57 +08:00
Dan Poltawski
0efd8de527 Merge branch 'w02_MDL-36898_m25_ccontact' of git://github.com/skodak/moodle 2013-01-15 13:57:39 +08:00
Dan Poltawski
09ade47f55 Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle 2013-01-15 13:55:50 +08:00
Dan Poltawski
85533e2a03 Merge branch 'MDL-37077-master' of git://github.com/ankitagarwal/moodle 2013-01-15 13:54:40 +08:00
Ankit Agarwal
644a7ef7a4 MDL-37077 phpunit: Adding phpunit tests for the ws api core_calendar_delete_event 2013-01-15 13:54:38 +08:00
Frederic Massart
7aff468346 MDL-36708 files: Checking the size limit of a draft area does include references 2013-01-15 13:48:05 +08:00
Dan Poltawski
5b2d44e9ca Merge branch 'w02_MDL-37391_m25_enrolconnection' of git://github.com/skodak/moodle 2013-01-15 13:43:20 +08:00
Dan Poltawski
cd7d79d3ab Merge branch 'w02_MDL-37064_m25_languser' of git://github.com/skodak/moodle 2013-01-15 13:36:44 +08:00
Ankit Agarwal
01bea07d93 MDL-37077 webservices: Implementing the WS api core_calendar_delete_calendar_events() 2013-01-15 13:23:14 +08:00
Ankit Agarwal
5e1350abaa MDL-37077 webservices: Define the ws api method for deleting calendar events 2013-01-15 13:23:13 +08:00
Dan Poltawski
9d40849d46 Merge branch 'MDL-37162_master' of git://github.com/pauln/moodle 2013-01-15 13:23:02 +08:00
Dan Poltawski
8b16bbfc68 Merge branch 'MDL-35556d' of git://github.com/srynot4sale/moodle 2013-01-15 13:15:31 +08:00
Dan Poltawski
bfee251334 Merge branch 'MDL-33669' of git://github.com/equella/moodle 2013-01-15 13:13:53 +08:00
Dan Poltawski
cc1521f57b Merge branch 'MDL-37355-master' of git://github.com/mouneyrac/moodle 2013-01-15 13:11:46 +08:00
Dan Poltawski
27885779bc Merge branch 'MDL-36991-master' of git://github.com/sammarshallou/moodle 2013-01-15 13:06:10 +08:00
Dan Poltawski
76a32e1a6f Merge branch 'MDL-37374' of git://github.com/timhunt/moodle 2013-01-15 12:59:33 +08:00
Dan Poltawski
01dcd9d770 Merge branch 'MDL-35793' of git://github.com/timhunt/moodle 2013-01-15 12:56:51 +08:00
Dan Poltawski
9cbb0944c9 Merge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle 2013-01-15 12:54:28 +08:00