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
Dan Poltawski
0542fdc6b4
Merge branch 'w17_MDL-39343_m25_installupgrade' of git://github.com/skodak/moodle
2013-04-30 13:37:52 +01:00
Dan Poltawski
bcf615af6c
MDL-39414 portfolio: don't queue google portfolio exports
...
This is a bit of an ugly way of saying 'I dont support queued exports'.
The google plugins need a valid user session in order to export to the
google services, thereforce we are forcing the export to be interactive
and not queued through cron, as this wont work in the current
implmenetation.
It's possible we could add offline access to the plugins, but I don't
believe it is worth the benefit for the additional complexity.
2013-04-30 10:16:01 +01:00
Dan Poltawski
8926c9fbcd
Merge branch 'w17_MDL-39402_m25_themedep' of git://github.com/skodak/moodle
2013-04-30 09:57:29 +01:00
Petr Škoda
e2e35e71f9
MDL-39343 disable all caching in install and upgrades
...
This should resolve all problem on developer machines when switching branches or when restoring previous Moodle databases. It also prevents any potential problems during upgrades such as concurrent DB modification and resolves chicken egg problems in future caching upgrades.
2013-04-30 10:27:34 +02:00
Damyon Wiese
b587727065
MDL-39354 Theme - Keep base and bootstrapbase in-sync
...
Add 7px margin-right to checkboxes and radio buttons
2013-04-30 16:24:14 +08:00
Damyon Wiese
89dc06570d
Merge branch 'MDL-39354' of git://github.com/timhunt/moodle
2013-04-30 16:24:07 +08:00
Dan Poltawski
f8a14f7bcc
Merge branch 'MDL-39405-master-int' of git://github.com/FMCorz/moodle
2013-04-30 09:16:31 +01:00
Frederic Massart
9b108a8606
MDL-39265 feedback: Language string improvements
...
AMOS BEGIN
MOV [multiple_submit,mod_feedback],[multiplesubmit,mod_feedback]
MOV [emailnotification_help,mod_feedback],[email_notification_help,mod_feedback]
AMOS END
2013-04-30 15:58:44 +08:00
Dan Poltawski
0174ada56c
Merge branch 'w17_MDL-39292_m25_enrolicons' of git://github.com/skodak/moodle
2013-04-30 08:52:49 +01:00
Damyon Wiese
34e46d7556
Merge branch 'mdl-39335' of git://github.com/vostreltsov/moodle
2013-04-30 15:51:12 +08:00
Andrew Nicols
b72d78d847
MDL-39355: Set tooltip zindex for bootstrap theme
2013-04-30 08:45:53 +01:00
Dan Poltawski
7a286a0d6d
Merge branch 'MDL-39415-master' of git://github.com/damyon/moodle
2013-04-30 08:34:16 +01:00
Dan Poltawski
e0b3f5f235
Merge branch 'w17_MDL-39077_m25_sizes' of git://github.com/skodak/moodle
2013-04-30 08:24:31 +01:00
Damyon Wiese
59d003497c
Merge branch 'MDL-39351' of git://github.com/timhunt/moodle
2013-04-30 14:13:25 +08:00
Jerome Mouneyrac
9f3cc17d8f
MDL-30775 get_course_contents: remove warnings when the section is empty
2013-04-30 14:06:44 +08:00
Damyon Wiese
a10c057b8e
Merge branch 'MDL-39322-master' of https://github.com/mackensen/moodle
2013-04-30 14:06:42 +08:00
Frederic Massart
7ce746f7cf
MDL-39405 wiki: Reformat forms for better usability
2013-04-30 14:05:54 +08:00
Damyon Wiese
767421c36c
Merge branch 'MDL-37966' of git://github.com/jonof/moodle
2013-04-30 12:26:47 +08:00
Sam Hemelryk
acf49f4b9a
MDL-39312 cache: interfaces for managing lock instances.
...
Bug: There was no way to create an instance of a lock plugin for use
within Moodle.
Solution: Implemented management interfaces as part of cache/admin.php
to allow for instances to be added and deleted.
This was done in along the same lines of adding store instances.
2013-04-30 16:26:34 +12:00
Damyon Wiese
4969053f25
Merge branch 'MDL-39246' of git://github.com/timhunt/moodle
2013-04-30 12:02:36 +08:00
David Monllao
550d842e3c
MDL-39232 behat Normalize feature tags according to component names
2013-04-30 11:54:47 +08:00
David Monllao
9b1dbe16db
MDL-39232 behat: Adding @_only_local tag
...
Tests which requires files to be uploaded should
be tagged as @_only_local.
2013-04-30 11:54:47 +08:00
Damyon Wiese
18de52db64
MDL-39415 Assign: Fix error on saving settings
...
When alwaysshowdescription checkbox is unchecked the form cant be saved.
This is a regression from when the element was changed from a
selectyesno to a checkbox.
2013-04-30 11:44:22 +08:00
Damyon Wiese
de079cffbf
Merge branch 'wip_MDL_39230_2_5' of http://github.com/jamiepratt/moodle.git
2013-04-30 11:39:56 +08:00
Jamie Pratt
397acdfda2
MDL-39230 Question bank - refactor xml import
...
Allow for reuse of code to read xml questions.
2013-04-30 11:38:26 +08:00
Andrew Davis
dc514c1a0b
MDL-35385 mod_chat: made sure no message popups display within the chat window
2013-04-30 09:01:00 +08:00
Frederic Massart
09faedd129
MDL-39265 feedback: Reformat module settings form
2013-04-30 08:33:20 +08:00
Sam Hemelryk
5c8f681713
MDL-39216 url: moodle_url now handles empty param values properly
2013-04-30 11:09:47 +12:00
Sam Hemelryk
45d9752205
MDL-39216 url: updated tests to show desired outcome
2013-04-30 11:09:47 +12:00
Sam Hemelryk
616396a6cf
MDL-39216 url: new moodle_url tests for valueless params
2013-04-30 11:09:47 +12:00
Sam Hemelryk
d36cc73edb
Merge branch 'w17_MDL-39386_m25_enroldocs' of git://github.com/skodak/moodle
2013-04-30 11:00:06 +12:00
Sam Hemelryk
2a03b6dafe
Merge branch 'MDL-39366-master-int' of git://github.com/FMCorz/moodle
2013-04-30 10:38:38 +12:00
Sam Hemelryk
0f540591df
Merge branch 'MDL-39303_master' of https://github.com/markn86/moodle
2013-04-30 10:08:20 +12:00