Eloy Lafuente (stronk7)
4fcc358e12
Merge branch 'MDL-33426-master' of git://github.com/sammarshallou/moodle
2012-07-03 16:08:03 +02:00
sam marshall
110f73ad57
MDL-33426 Completion: Multilang activity names wrong in alt/title
2012-07-03 13:10:14 +01:00
Michael Aherne
26a06fa7b6
MDL-34156 Remove subselect from slow query
2012-07-03 12:56:50 +01:00
Rajesh Taneja
fc3aa0fbaf
MDL-32787 user: rule required for custom profile fields applies to all users editing own profile
2012-07-03 13:46:13 +08:00
Sam Hemelryk
e537a588d8
Merge branch 'MDL-33828-master' of git://github.com/FMCorz/moodle
2012-07-03 16:35:32 +12:00
Dan Poltawski
eb85dafc8b
Merge branch 'MDL-33937-master' of git://github.com/sammarshallou/moodle
2012-07-03 12:29:57 +08:00
Dan Poltawski
d4c16e8b63
Merge branch 'master_MDL-33938' of git://github.com/danmarsden/moodle
...
Conflicts:
mod/scorm/db/upgrade.php
2012-07-03 12:19:07 +08:00
Dan Poltawski
3da087a8b4
Merge branch 'wip-MDL-30912-master' of git://github.com/abgreeve/moodle
2012-07-03 12:11:48 +08:00
Dan Poltawski
f884819546
Merge branch 'MDL-30903-master' of git://github.com/FMCorz/moodle
2012-07-03 11:51:04 +08:00
Dan Poltawski
d07f3425ca
Merge branch 'MDL-34008' of git://github.com/timhunt/moodle
2012-07-03 11:47:15 +08:00
Dan Poltawski
606319c927
Merge branch 'w27_MDL-34036_m24_bulkrole' of git://github.com/skodak/moodle
2012-07-03 11:40:08 +08:00
Sam Hemelryk
78e43b866b
Merge branch 'w27_MDL-34115_m24_arrayofarrayssort' of git://github.com/skodak/moodle
2012-07-03 15:15:07 +12:00
Dan Poltawski
7d27947851
Merge branch 'MDL-30883' of git://github.com/timhunt/moodle
2012-07-03 11:01:39 +08:00
Sam Hemelryk
04573eaa65
Merge branch 'wip-MDL-33957-master' of git://github.com/phalacee/moodle
2012-07-03 14:57:41 +12:00
Dan Poltawski
114244ce6c
Merge branch 'w27_MDL-34123_m24_newpasslang' of git://github.com/skodak/moodle
2012-07-03 10:39:12 +08:00
Dan Poltawski
66dd9e8ad4
Merge branch 'wip-MDL-33837-master' of git://github.com/marinaglancy/moodle
2012-07-03 10:24:26 +08:00
Sam Hemelryk
73d38068d9
Merge branch 'MDL-33987_master' of git://github.com/lazydaisy/moodle
2012-07-03 14:14:31 +12:00
Dan Poltawski
d3faa829cd
Merge branch 'MDL-33757-master' of git://github.com/ankitagarwal/moodle
2012-07-03 09:45:12 +08:00
Frederic Massart
c31dc0b695
MDL-33828 Portfolio: prevent notices while exporting to portfolios
2012-07-03 09:33:17 +08:00
ISHIKAWA Takayuki
69101b4392
MDL-33757 gradebook: Adding support to sort userlist by email address
2012-07-03 09:09:05 +08:00
AMOS bot
f5e2530b16
Automatically generated installer lang files
2012-07-03 00:31:27 +00:00
Eloy Lafuente (stronk7)
9039021b25
Merge branch 'MDL-33499' of git://github.com/netspotau/moodle-mod_assign
2012-07-03 02:15:57 +02:00
Eloy Lafuente (stronk7)
f1d9ceb0e4
Merge branch 'wip-MDL-33521-m24' of git://github.com/samhemelryk/moodle
2012-07-03 01:58:48 +02:00
Adam Olley
c71fe473bb
MDL-32057: Fix cohort enrolment css for ie7
2012-07-03 09:22:11 +09:30
Sam Hemelryk
2da0a38398
Merge branch 'MDL-33770' of git://github.com/mouneyrac/moodle
2012-07-03 11:48:43 +12:00
Sam Hemelryk
e1d7771b0f
Merge branch 'MDL-33814-master' of git://github.com/FMCorz/moodle
2012-07-03 11:36:01 +12:00
Eloy Lafuente (stronk7)
5d16ab2bba
Merge branch 'MDL-33796-master' of git://github.com/FMCorz/moodle
2012-07-03 01:04:47 +02:00
Sam Hemelryk
4f5263d969
Merge branch 'MDL-34029_upgrade_documentation' of git://github.com/davosmith/moodle
2012-07-03 10:55:29 +12:00
Sam Hemelryk
14cff7be4d
Merge branch 'MDL-9214' of git://github.com/danpoltawski/moodle
2012-07-03 10:47:07 +12:00
Sam Hemelryk
c6c16fd9ea
Merge branch 'MDL-32286' of git://github.com/danpoltawski/moodle
2012-07-03 10:41:17 +12:00
Sam Hemelryk
b624ae9a2b
Merge branch 'MDL-33990' of git://github.com/danpoltawski/moodle
2012-07-03 10:36:57 +12:00
Sam Hemelryk
4df3e2bedf
MDL-34014 cssoptimiser: Fixed some aweful spelling
2012-07-03 10:34:20 +12:00
Sam Hemelryk
b5c4f3042b
Merge branch 'MDL-34014' of git://github.com/danpoltawski/moodle
2012-07-03 10:32:37 +12:00
Sam Hemelryk
457fc727ac
Merge branch 'MDL-34022' of git://github.com/danpoltawski/moodle
2012-07-03 10:30:30 +12:00
Sam Hemelryk
fc8931e457
Merge branch 'MDL-34033' of git://github.com/danpoltawski/moodle
2012-07-03 10:27:16 +12:00
Sam Hemelryk
a0c400598e
Merge branch 'MDL-33848' of git://github.com/netspotau/moodle-mod_assign
2012-07-03 10:20:56 +12:00
Sam Hemelryk
a8d40508e9
Merge branch 'MDL-28151' of git://github.com/danpoltawski/moodle
2012-07-03 10:13:12 +12:00
Eloy Lafuente (stronk7)
a788105e13
Merge branch 'MDL-23813' of git://github.com/timhunt/moodle
2012-07-02 23:50:39 +02:00
Sam Hemelryk
30141a875e
Merge branch 'MDL-23254' of git://github.com/nebgor/moodle
2012-07-03 09:42:08 +12:00
Eloy Lafuente (stronk7)
43a6a288b4
Merge branch 'mssql-case-sensitive' of git://github.com/danpoltawski/moodle
2012-07-02 21:05:08 +02:00
Tim Hunt
ff8c5fda48
MDL-23813 glossary filter: add missing YUI dependency
...
Fix found by Huy Hoang. I am just making a commit.
2012-07-02 17:50:00 +01:00
Eloy Lafuente (stronk7)
44cb29a063
MDL-34121 bump versions to efectively get the upgrade performed.
2012-07-02 18:15:47 +02:00
Eloy Lafuente (stronk7)
d207a888ba
Merge branch 'w27_MDL-34121_m24_killbackupmess' of git://github.com/skodak/moodle
2012-07-02 18:12:57 +02:00
Tim Hunt
5415d91e20
MDL-34145 postgres driver: fix get_tables perf on <= 9.0
...
The query of the information_schema view seems to be painfully slow on
older versions of postgres (2000ms instead of 20ms). Therefore, it is
worth detecting that case, and using a more postgres specific feedback.
This is particularly important for 2.3+ unit tests.
Thanks to Petr Skoda for his help with this.
2012-07-02 16:19:00 +01:00
Dan Poltawski
79121bb8ef
Merge branch 'wip-MDL-33948-master' of git://github.com/marinaglancy/moodle
2012-07-02 17:44:01 +08:00
Dan Poltawski
6cad0dddd7
Merge branch 'MDL-33916-master-2' of git://git.luns.net.uk/moodle
2012-07-02 17:35:46 +08:00
Dan Poltawski
2d9c0d1174
MDL-31802 - navigation: add a comment about session reduction
2012-07-02 17:30:26 +08:00
Dan Poltawski
539f2381f6
Merge branch 'MDL-31802' of git://github.com/aolley/moodle
2012-07-02 17:24:48 +08:00
Dan Poltawski
fc7f44a961
Merge branch 'wip-MDL-34117-master' of git://github.com/marinaglancy/moodle
2012-07-02 17:09:44 +08:00
Dan Poltawski
6fa25ccd26
Merge branch 'w27_MDL-34120_m24_delpass' of git://github.com/skodak/moodle
2012-07-02 16:48:22 +08:00
