Commit graph

56494 commits

Author SHA1 Message Date
Aparup Banerjee
736cc6a246 Merge branch 'MDL-26504_blog_unregister' of git://github.com/andyjdavis/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-09-04 13:43:11 +08:00
Jerome Mouneyrac
4647b4d76f MDL-34973 PHPunit test: notes/externallib.php 2012-09-04 13:38:36 +08:00
Sam Hemelryk
b5b82ae943 Merge branch 'MDL-30022_message_duplicate' of git://github.com/andyjdavis/moodle 2012-09-04 16:50:36 +12:00
Jerome Mouneyrac
1f867c025b MDL-34970 PHPunit test: group/externallib.php 2012-09-04 12:34:40 +08:00
Jerome Mouneyrac
566596abd7 MDL-34967 PHPunit test: enrol/externallib.php and enrol/manual/externallib.php 2012-09-04 12:26:21 +08:00
Aparup Banerjee
82fb0aa576 MDL-31365 theme: mymobile updated to compatible declaration 2012-09-04 12:10:30 +08:00
Tim Hunt
0e708c3476 MDL-34257 quiz 'secure' mode: PAGE initialisation order issues. 2012-09-04 11:39:38 +08:00
Aparup Banerjee
8f8e28c0b6 Merge branch 'MDL-31365_master' of https://github.com/birdy1976/moodle 2012-09-04 11:38:11 +08:00
Tim Lock
c3a0938e79 MDL-35092: Add proxy support to enrol/paypal IPN 2012-09-04 10:55:09 +08:00
Simon Coggins
02ed0df5ae MDL-34755 SCORM: pop-up not loading in IE7/IE8 compat mode 2012-09-04 13:11:22 +12:00
Eloy Lafuente (stronk7)
519fb0b878 Merge branch 'wip-mdl-34606' of git://github.com/rajeshtaneja/moodle 2012-09-04 02:08:54 +02:00
Eloy Lafuente (stronk7)
12e0ecde48 Merge branch 'MDL-34633-master' of git://github.com/FMCorz/moodle 2012-09-04 01:52:08 +02:00
Eloy Lafuente (stronk7)
259208e0ab MDL-31295 assign: fix comments in upgrade code. 2012-09-04 01:27:49 +02:00
Eloy Lafuente (stronk7)
7ef0d527b2 Merge branch 'MDL-31295-POST23' of git://github.com/netspotau/moodle-mod_assign 2012-09-04 01:20:55 +02:00
Eloy Lafuente (stronk7)
b448cf475e Merge branch 'MDL-29662' of git://github.com/timhunt/moodle 2012-09-04 01:14:06 +02:00
Eloy Lafuente (stronk7)
5087a95e9c Merge branch 'MDL-27818' of git://github.com/timhunt/moodle 2012-09-04 01:06:48 +02:00
Dan Marsden
cfa5063777 MDL-35208 mod_choice: respect order of options when running backup 2012-09-04 11:01:06 +12:00
Eloy Lafuente (stronk7)
5b38b6be70 Merge branch 'w36_MDL-35189_m24_typo3' of git://github.com/skodak/moodle 2012-09-04 00:38:30 +02:00
Eloy Lafuente (stronk7)
8619c884d9 Merge branch 'w36_MDL-35185_m24_flowplayer' of git://github.com/skodak/moodle 2012-09-04 00:35:48 +02:00
Eloy Lafuente (stronk7)
a39c97ca4a Merge branch 'MDL-33306' of git://github.com/timhunt/moodle 2012-09-04 00:30:35 +02:00
Eloy Lafuente (stronk7)
edeb39d44a Merge branch 'MDL-33812-master' of git://github.com/FMCorz/moodle 2012-09-04 00:19:53 +02:00
Eloy Lafuente (stronk7)
bf14738ea1 Merge branch 'MDL-34725-strict-standards' of git://github.com/mudrd8mz/moodle 2012-09-04 00:05:52 +02:00
Eloy Lafuente (stronk7)
717282a5da Merge branch 'w36_MDL-34097_m24_environment' of git://github.com/skodak/moodle 2012-09-04 00:00:20 +02:00
Eloy Lafuente (stronk7)
4ee9de8f8f Merge branch 'w36_MDL-35188_m24_tcpdf' of git://github.com/skodak/moodle 2012-09-03 23:42:14 +02:00
Eloy Lafuente (stronk7)
ffa9378541 Merge branch 'w36_MDL-35186_m24_phpmailer' of git://github.com/skodak/moodle 2012-09-03 23:31:13 +02:00
Paul Charsley
5e21657f87 Merge branch 'master' of https://github.com/moodle/moodle
Conflicts:
	files/externallib.php
2012-09-04 08:58:31 +12:00
Eloy Lafuente (stronk7)
e246a8056e Merge branch 'w36_MDL-35184_m24_adodb' of git://github.com/skodak/moodle 2012-09-03 20:16:20 +02:00
Eloy Lafuente (stronk7)
8f487cb608 Merge branch 'MDL-28346-master' of git://github.com/FMCorz/moodle 2012-09-03 19:30:21 +02:00
Petr Škoda
ffdd502dbd MDL-35184 import adodb 5.17 2012-09-03 18:49:53 +02:00
Eloy Lafuente (stronk7)
66ea24cf70 Merge branch 'w36_MDL-35077_m24_stats' of git://github.com/skodak/moodle 2012-09-03 17:53:34 +02:00
Eloy Lafuente (stronk7)
1cdcfb7813 Merge branch 'MDL-35133' of git://github.com/timhunt/moodle 2012-09-03 17:47:33 +02:00
Eloy Lafuente (stronk7)
7fcfa721b7 Merge branch 'w36_MDL-35168_m24_yuipath' of git://github.com/skodak/moodle 2012-09-03 17:07:39 +02:00
Eloy Lafuente (stronk7)
55970f85a4 Merge branch 'w36_MDL-35145_m24_guestdelete' of git://github.com/skodak/moodle 2012-09-03 16:17:51 +02:00
Eloy Lafuente (stronk7)
efca150b15 Merge branch 'MDL-31973-master-7' of git://git.luns.net.uk/moodle 2012-09-03 15:49:50 +02:00
Aparup Banerjee
4da70893ef Merge branch 'MDL-35151_master' of git://github.com/lazydaisy/moodle 2012-09-03 19:21:29 +08:00
Aparup Banerjee
3c59897f79 Merge branch 'MDL-35180_master' of git://github.com/lazydaisy/moodle 2012-09-03 17:37:29 +08:00
Aparup Banerjee
bb048c6afa Merge branch 'w36_MDL-35080_m24_weirdtables' of git://github.com/skodak/moodle 2012-09-03 17:09:23 +08:00
Jerome Mouneyrac
e643266843 MDL-34972 PHPunit test: message/externallib.php 2012-09-03 15:27:22 +08:00
Rajesh Taneja
732c25ade9 MDl-30667 Course: Maxbytes list will show current value, if it's lower then maxbytes 2012-09-03 14:43:33 +08:00
Frederic Massart
b2245b7e8a MDL-34633 Repository: Flickr supports small images 2012-09-03 14:21:53 +08:00
Frederic Massart
87294fa346 MDL-35101 Repository: Public Flickr fails when the picture has no license 2012-09-03 14:20:45 +08:00
Jean-Philippe Gaudreau
1ba43a9c6f MDL-34997 - Allow shortened url youtu.be and y2u.be for Youtube filter 2012-09-03 14:13:41 +08:00
Frederic Massart
4b30377dd1 MDL-34765 Course: Re-sorting courses uses natural order 2012-09-03 14:13:27 +08:00
Frederic Massart
a173b52da0 MDL-28346 Backup: Backup does not fail when a file is missing 2012-09-03 14:13:11 +08:00
Frederic Massart
3b232aeffb MDL-28346 Backup: Restore does not fail when a file is missing 2012-09-03 14:13:11 +08:00
Frederic Massart
05e521c9bc MDL-28346 Backup: Added new status 'warning' for backup result 2012-09-03 14:13:11 +08:00
Frederic Massart
ec7e998f4b MDL-35034 Repository: Google Docs does not fail when download is restricted 2012-09-03 14:12:43 +08:00
Frederic Massart
61d71da334 MDL-33812 Backup: Added some upgrade information about the changes 2012-09-03 14:12:28 +08:00
Frederic Massart
14ecc5a80c MDL-33812 Backup: Revert MDL-33521 2012-09-03 14:12:28 +08:00
Frederic Massart
e2aebdc928 MDL-33812 Backup: Respect of backup_auto_keep 2012-09-03 14:12:28 +08:00