Marina Glancy
69bbd2a7cd
MDL-38594 Core themes changed for the new course listings styles
2013-05-03 11:16:16 +10:00
Marina Glancy
d891aaba73
MDL-39318 CSS bug on mouse hover of paging bar in some themes
2013-05-03 11:14:49 +10:00
Dan Poltawski
95190fda69
on demand release 2.5beta+
2013-05-02 14:34:48 +01:00
Dan Poltawski
b741e1c186
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
2013-05-02 14:32:03 +01:00
Damyon Wiese
e7c5ee5102
Merge branch 'MDL-30775-master' of git://github.com/mouneyrac/moodle
...
Conflicts:
course/externallib.php
2013-05-02 16:20:30 +08:00
Damyon Wiese
b99122155c
Merge branch 'MDL-39401' of git://github.com/rwijaya/moodle
2013-05-02 14:50:49 +08:00
Damyon Wiese
9c898f682a
Merge branch 'MDL-39207_master' of git://github.com/totara/openbadges
2013-05-02 14:44:20 +08:00
Rossiani Wijaya
2213893766
MDL-39401 portfolio: fixed setType() warnings in box.net and flickr portfolios
2013-05-02 14:20:03 +08:00
Damyon Wiese
f85fba3eeb
Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-05-02 13:54:59 +08:00
Damyon Wiese
c9c01f75b1
MDL-39077 maxbytes - fix warnings for cli install
2013-05-02 12:11:08 +08:00
Yuliya Bozhko
265b866fe5
MDL-39207 badges: Generate badge assertions using user's backpack email if it is set
2013-05-02 16:05:11 +12:00
Eloy Lafuente (stronk7)
e7ff753cab
Merge branch 'wip-MDL-39432-m25-i' of git://github.com/samhemelryk/moodle
2013-05-02 03:33:35 +02:00
AMOS bot
fdb2851204
Automatically generated installer lang files
2013-05-02 00:38:12 +00:00
Andrew Nicols
323aa3248c
MDL-39355: Correct the z-index for moodle-dialogue
2013-05-01 18:34:04 +01:00
Dan Poltawski
d773056669
Merge branch 'MDL-39367-master-int' of git://github.com/FMCorz/moodle
2013-05-01 17:32:09 +01:00
Eloy Lafuente (stronk7)
ea7f9109d5
MDL-39434 Bump main version to observe all deps
2013-05-01 18:04:58 +02:00
Eloy Lafuente (stronk7)
cedb0aab5a
MDL-39434 Bump all versions near 2.5 release
2013-05-01 18:03:29 +02:00
Eloy Lafuente (stronk7)
2f679b426a
Merge branch 'MDL-39444' of git://github.com/timhunt/moodle
2013-05-01 16:55:36 +02:00
Damyon Wiese
367b977d4d
MDL-39077 max_files does not include current option when it is non-standard
...
Non-standard means php.ini was set to something not in the default list (like 7MB),
then the config was saved to that specific value, and now the value in php.ini has been changed
again so 7MB does not appear in the list.
2013-05-01 12:40:57 +01:00
Tim Hunt
296daf41c7
MDL-39444 get_string: remove unnecessary clean_param
...
This clean_param was added as part of MDL-22015. It is a good idea when
developer debug is turned on, but it showed up as a surprisingly
expensive cost in our profiling.
This change:
1. Removes the check during string_extist. This will not change
behaviour, the method returns false if the string does not exist.
2. In get_string, it only does the check if debugging is set to
DEVELOPER level.
2013-05-01 10:16:37 +01:00
Dan Poltawski
5f5843f84b
Merge branch 'w17_MDL-39402_m25_themedep' of git://github.com/skodak/moodle
2013-05-01 09:53:18 +01:00
Petr Škoda
a824d7d4ac
MDL-39402 fix wrong binarius dependency
...
Credit goes to Frédéric Massart, thanks.
2013-05-01 10:36:30 +02:00
Dan Poltawski
142fa8c75d
Merge branch 'MDL-39438_master' of git://github.com/dmonllao/moodle
2013-05-01 08:32:30 +01:00
Sam Hemelryk
15f89e2872
MDL-39422 course: converted closures to fix eAccelerator issues
2013-05-01 18:43:27 +12:00
Dan Poltawski
dd4a197e0f
MDL-39207 badges: don't use curl version depedent constant
...
It seems that CURLOPT_CONNECTTIMEOUT_MS is depdendent on the version
of curl compiled against. We don't need milliseconds here anyway, so
switch to the seconds value.
2013-05-01 07:21:58 +01:00
David Monllao
5bc7cd922b
MDL-39438 behat: Updating tests
...
According to MDL-38415 changes.
2013-05-01 13:39:06 +08:00
Damyon Wiese
25927c42ce
MDL-39312 Cache lock plugins - fix undefined var and language typo
2013-05-01 10:51:32 +08:00
Damyon Wiese
a6b274b232
Merge branch 'wip-MDL-39312-m25' of git://github.com/samhemelryk/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-05-01 10:04:50 +08:00
AMOS bot
f4711cd2f5
Automatically generated installer lang files
2013-05-01 00:39:23 +00:00
Eloy Lafuente (stronk7)
bee592add8
Merge branch 'wip-MDL-39216-m25' of git://github.com/samhemelryk/moodle
2013-05-01 02:29:36 +02:00
Sam Hemelryk
a697000b53
MDL-39216 url: included test for empty string param
2013-05-01 12:27:36 +12:00
Eloy Lafuente (stronk7)
6fc4895276
Merge branch 'wip-MDL-39432-m25' of git://github.com/samhemelryk/moodle
2013-05-01 01:33:18 +02:00
Sam Hemelryk
d25103c4ef
Merge branch 'MDL-39422-master' of git://github.com/danpoltawski/moodle
...
Conflicts:
mod/wiki/mod_form.php
2013-05-01 11:15:24 +12:00
Sam Hemelryk
eb426f2480
Merge branch 'wip-MDL-39099_master' of git://github.com/gjb2048/moodle
2013-05-01 11:05:05 +12:00
Sam Hemelryk
bcd4bf0343
Merge branch 'MDL-39414-master' of git://github.com/danpoltawski/moodle
2013-05-01 11:02:25 +12:00
Eloy Lafuente (stronk7)
6a222aa127
Merge branch 'MDL-39232_master' of git://github.com/dmonllao/moodle
2013-05-01 00:47:32 +02:00
Sam Hemelryk
91a8b40427
MDL-39432 course: converted closures to lambda functions
2013-05-01 10:41:00 +12:00
Sam Hemelryk
fdba83df89
Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle
2013-05-01 10:24:13 +12:00
Sam Hemelryk
48fce3678d
Merge branch 'MDL-36060-master' of git://github.com/danpoltawski/moodle
2013-05-01 10:14:28 +12:00
Mark Nielsen
d81a603ee2
MDL-36060: Remove anonymous functions in mod/lti
...
This was breaking eaccelerator because it doesn't
support anonymous functions.
2013-04-30 17:50:07 +01:00
Dan Poltawski
a74cd33160
MDL-39422 mod_forms: prevent long coruse module names
...
To prevent ugly DB errors.
2013-04-30 17:41:36 +01:00
Dan Poltawski
4fb3df32ac
MDL-39422 course: prevent module names longer 255 chars
...
To prevent ugly DB errors.
2013-04-30 17:21:15 +01:00
Gareth J Barnard
3f435f899d
MDL-39099 course_format: Allow section_summary() to be overridden.
2013-04-30 16:56:55 +01:00
Dan Poltawski
fb92d5ef57
Merge branch 'MDL-39270-master-int' of git://github.com/FMCorz/moodle
2013-04-30 16:13:48 +01:00
Dan Poltawski
21a6714fc9
Merge branch 'MDL-39265-master-int' of git://github.com/FMCorz/moodle
2013-04-30 15:49:41 +01:00
Dan Poltawski
1af49024a5
Merge branch 'MDL-39207_master' of git://github.com/totara/openbadges
2013-04-30 14:42:44 +01:00
Dan Poltawski
2e521b3d56
Merge branch 'MDL-39368-master-int' of git://github.com/FMCorz/moodle
2013-04-30 14:35:28 +01:00
Dan Poltawski
24fa63f415
Merge branch 'w17_MDL-39343_m25_installupgrade' of git://github.com/skodak/moodle
2013-04-30 14:11:34 +01:00
Dan Poltawski
4410509d0b
Merge branch 'MDL-35385_chat' of git://github.com/andyjdavis/moodle
2013-04-30 14:07:55 +01:00
Petr Škoda
2cc9fa88f6
MDL-39343 disables MUC caches in phpunit and behat install/drop
2013-04-30 15:05:53 +02:00