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
Ankit Agarwal
c524394d88
MDL-37295 forum: Parse old log entries during restore
2013-01-15 13:57:40 +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
Dan Poltawski
d0827c938f
Merge branch 'wip-MDL-30998-master' of git://github.com/marinaglancy/moodle
2013-01-15 12:51:48 +08:00
Dan Poltawski
37f3f3ac73
Merge branch 'wip-MDL-30316-master' of git://github.com/phalacee/moodle
2013-01-15 12:46:44 +08:00
Dan Poltawski
b1be977406
Merge branch 'w02_MDL-29596_m25_editauth' of git://github.com/skodak/moodle
2013-01-15 12:43:59 +08:00
Dan Poltawski
aa452f97e3
Merge branch 'MDL-29835_master' of git://github.com/pauln/moodle
2013-01-15 12:41:13 +08:00
Dan Poltawski
97f236e747
Merge branch 'MDL-32341-master' of git://github.com/ankitagarwal/moodle
2013-01-15 12:38:22 +08:00
Dan Poltawski
28cfdfe180
Merge branch 'MDL-37366-master' of git://github.com/andrewnicols/moodle
2013-01-15 12:10:10 +08:00
Dan Poltawski
fb8585521a
Merge branch 'wip-MDL-36035-m25' of git://github.com/samhemelryk/moodle
2013-01-15 11:56:12 +08:00
Dan Poltawski
4a489ba465
Merge branch 'MDL-36616-master' of git://github.com/FMCorz/moodle
2013-01-15 11:48:11 +08:00
Dan Poltawski
33919cca60
MDL-37085 - fix trailing whitespace
2013-01-15 11:42:30 +08:00
Sam Hemelryk
c8d3475e17
Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle
2013-01-15 16:30:36 +13:00
Erik Lundberg
af7e05d6cc
MDL-34436 - Blogs - Adding event triggers when adding a new entry, editing an entry or remove an entry.
2013-01-15 11:29:12 +08:00
Dan Poltawski
0a9b944a15
Merge branch 'MDL-36587-master' of git://github.com/damyon/moodle
...
Conflicts:
mod/assign/locallib.php
2013-01-15 11:19:40 +08:00
Rossiani Wijaya
b0ff0e9aae
MDL-34050 Lesson Module: Fixed spacing and removed array_unique() for responses
2013-01-15 11:17:55 +08:00
Damyon Wiese
a83dd077f8
MDL-37430 Course - Make modules created in hidden sections visible when section is made visible.
2013-01-15 11:16:07 +08:00
Dan Poltawski
a0ea4d9fe1
Merge branch 'MDL-37415-m' of git://github.com/andrewnicols/moodle
2013-01-15 11:09:27 +08:00
David Monllao
6b21986911
MDL-37457 testing Mark current classes as deprecated
2013-01-15 11:07:45 +08:00
David Monllao
5c3c2c81be
MDL-37457 testing Refactoring references
2013-01-15 11:07:43 +08:00
Dan Poltawski
121d7a3f7d
Merge branch 'MDL-37413-m' of git://github.com/andrewnicols/moodle
2013-01-15 10:58:31 +08:00
Dan Poltawski
2254fb2764
Merge branch 'MDL-37194-master' of git://github.com/mouneyrac/moodle
2013-01-15 10:42:31 +08:00
Paul Nicholls
d7c29c2257
MDL-32652 - Make block drag-drop work throughout Moodle
...
Other than shifting the initialisation from course/lib.php to
lib/outputrequirementslib.php, some workarounds/tweaks were required
in order to make it work correctly on admin pages and My Home.
2013-01-15 14:55:31 +13:00
Marina Glancy
54258889f2
MDL-37085 added missing get_renderer call
2013-01-15 12:14:31 +11:00
Eloy Lafuente (stronk7)
ca2dfd0070
Merge branch 'MDL-37431' of git://github.com/timhunt/moodle
2013-01-15 00:16:18 +01:00
Eloy Lafuente (stronk7)
eaa00a071c
Merge branch 'wip-MDL-37453-master' of git://github.com/marinaglancy/moodle
2013-01-15 00:06:06 +01:00
Eloy Lafuente (stronk7)
fe25b31d44
Merge branch 'MDL-37456' of git://github.com/danpoltawski/moodle
2013-01-14 23:32:39 +01:00
Eloy Lafuente (stronk7)
f38ac3510a
Merge branch 'w02_MDL-37483_m25_redirect' of git://github.com/skodak/moodle
2013-01-14 23:29:55 +01:00
Eloy Lafuente (stronk7)
b9bbc2a356
Merge branch 'MDL-37485' of git://github.com/timhunt/moodle
2013-01-14 23:21:38 +01:00