Commit graph

78854 commits

Author SHA1 Message Date
Mark Nelson
4aa7e3fe18 MDL-53864 mod_feedback: fixed varying results on MSSQL 2016-04-21 11:32:49 +08:00
Dan Poltawski
8ef18bda2b Merge branch 'MDL-46092' of git://github.com/timhunt/moodle 2016-04-20 22:20:35 +01:00
Tim Hunt
de2fec2e9a MDL-46092 bootstrapbase: add OU quiz styling
It is a nicer default to have in Moodle that what we had before.
2016-04-20 15:43:34 +01:00
Dan Poltawski
17883c016b Merge branch 'wip-MDL-52642-master' of git://github.com/abgreeve/moodle 2016-04-20 13:30:38 +01:00
Dan Poltawski
795adc89af Merge branch 'MDL-52490_master' of https://github.com/dmonllao/moodle 2016-04-20 12:38:15 +01:00
Dan Poltawski
d6c8570f55 Merge branch 'MDL-53095-master' of git://github.com/lameze/moodle 2016-04-20 11:49:50 +01:00
Dan Poltawski
913dcb1b81 Merge branch 'MDL-53451-master-fixup' of https://github.com/FMCorz/moodle 2016-04-20 11:28:55 +01:00
Dan Poltawski
4ee37fe04b Merge branch 'wip-MDL-53798-master' of https://github.com/marinaglancy/moodle 2016-04-20 11:09:48 +01:00
Frederic Massart
d789158566 MDL-53451 tool_lpmigrate: Fixing broken logic found in tests
Thanks to MSSQL, the only one with failures.
2016-04-20 17:52:09 +08:00
Dan Poltawski
ab64fe91fc Merge branch 'wip-MDL-51354_master' of https://github.com/cdsmith-umn/moodle 2016-04-20 10:33:23 +01:00
Dan Poltawski
ad2382730e Merge branch 'MDL-53309_master-second-attempt' of git://github.com/dmonllao/moodle 2016-04-20 10:27:57 +01:00
David Monllao
15a813cda2 Merge branch 'MDL-53599' of git://github.com/nhoobin/moodle 2016-04-20 16:38:57 +08:00
David Monllao
6870e1fa77 Merge branch 'MDL-53757_master' of git://github.com/markn86/moodle 2016-04-20 15:52:57 +08:00
Frederic Massart
4fd183d3c3 MDL-53451 competency: Hook for scale_used used undefined variable 2016-04-20 15:44:01 +08:00
Frederic Massart
0abaf33e00 MDL-53451 competency: Fixing database errors on Oracle
- Random ordering caused by absence of ORDER BY clause
- Invalid query statemennt due to wrong string concatenation
- Cannot GROUP BY with CLOB columns
2016-04-20 15:44:01 +08:00
Andrew Nicols
eb91deaa85 Merge branch 'MDL-51603-dataformat-MDL-34925-user-download' of https://github.com/brendanheywood/moodle 2016-04-20 14:45:44 +08:00
David Monllao
ba44323329 MDL-51603 dataformat: Removing subsystem from the list 2016-04-20 14:41:28 +08:00
David Monllao
a5acf308ae Merge branch 'MDL-51603-dataformat' of https://github.com/brendanheywood/moodle
Conflicts:
	lib/tests/component_test.php
2016-04-20 12:37:05 +08:00
David Monllao
65f9001d31 Merge branch 'MDL-48089-master' of git://github.com/danpoltawski/moodle 2016-04-20 12:24:07 +08:00
David Monllao
18641bf6e1 Merge branch 'MDL-48506_master' of git://github.com/markn86/moodle 2016-04-20 11:54:38 +08:00
Nick Phillips
7bdc3ba6e6 MDL-53757 core_calendar: always show whole day's events in 'day' view 2016-04-20 11:34:19 +08:00
David Monllao
82644d4966 Merge branch 'MDL-53382' of https://github.com/andrewhancox/moodle 2016-04-20 11:29:57 +08:00
David Monllao
d7eb33652f Merge branch 'MDL-53702_master' of https://github.com/liorgil/moodle 2016-04-20 11:10:23 +08:00
David Monllao
edc0c29f7b Merge branch 'MDL-25742-fix-individual-wiki' of git://github.com/cameron1729/moodle 2016-04-20 11:07:23 +08:00
David Monllao
c16c7530b1 Merge branch 'MDL-52596-assign-maxperpage' of https://github.com/brendanheywood/moodle 2016-04-20 11:04:10 +08:00
Brendan Heywood
12142298ec MDL-34925 user: Convert bulk user download to dataformat 2016-04-20 13:02:06 +10:00
David Monllao
45073995a1 Merge branch 'MDL-53799-31' of https://github.com/vadimonus/moodle 2016-04-20 10:59:49 +08:00
Brendan Heywood
1e29afd4ea MDL-51603 report_log: Allow streaming downloads 2016-04-20 12:39:29 +10:00
Brendan Heywood
5684cc2d1e MDL-51603 tablelib: Removed legacy export classes 2016-04-20 12:39:29 +10:00
Brendan Heywood
bdb80f6a5f MDL-51603 tablelib: Delegate to dataformat for downloading 2016-04-20 12:39:29 +10:00
Brendan Heywood
bff1edbe44 MDL-51603 dataformat: Implement streaming dataformat plugin 2016-04-20 12:39:25 +10:00
Cameron Ball
d5722b4447 MDL-25742 mod_wiki: Fix bug in get_tagged_pages 2016-04-20 10:37:34 +08:00
Brendan Heywood
b4772a41d1 MDL-51603 dataformat: Imported 3rd party lib spout 2016-04-20 12:33:35 +10:00
Eloy Lafuente (stronk7)
3a97e39825 Merge branch 'MDL-53660-master' of git://github.com/danpoltawski/moodle 2016-04-20 01:19:58 +02:00
Eloy Lafuente (stronk7)
4384d72024 Merge branch 'MDL-53043' of https://github.com/andrewhancox/moodle 2016-04-20 00:53:07 +02:00
Mark Nelson
027eb38ed5 MDL-48506 cachestore_memcached: make warning more noticeable 2016-04-19 17:11:05 +08:00
David Monllao
9a1414c4d8 Merge branch 'MDL-49279-master' of git://github.com/jleyva/moodle
Conflicts:
	lib/classes/plugin_manager.php
2016-04-19 16:55:01 +08:00
Simey Lameze
bc577c541f MDL-51267 mod: move the changes from the API to the form file 2016-04-19 16:36:26 +08:00
Juan Leyva
b2478ed0f6 MDL-49279 mobile: Support export of mobile addons in plugins 2016-04-19 10:32:53 +02:00
Jun Pataleta
00456f0bed MDL-53865 tool_lp: Add maxlength attr and validation for input fields 2016-04-19 15:40:36 +08:00
David Monllao
f3eb9951d1 MDL-53451 tool_lp: Removing unnecessary built modules 2016-04-19 13:56:49 +08:00
Jun Pataleta
30f1b35474 MDL-53853 tool_lp: Remove competency description in autocomplete 2016-04-19 13:16:17 +08:00
Mark Nelson
fcc9218fb8 MDL-53811 mod_assign: fixed error in convert submissions task 2016-04-19 13:08:27 +08:00
David Monllao
56ff87aea5 Merge branch 'wip-MDL-25742-master' of https://github.com/marinaglancy/moodle 2016-04-19 12:42:21 +08:00
David Monllao
c3b661403c Merge branch 'cbe' of git://github.com/FMCorz/moodle 2016-04-19 12:37:11 +08:00
Frederic Massart
4474c87401 MDL-53451 competency: Removing sneaky whitespaces 2016-04-19 12:21:36 +08:00
David Monllao
218fbd6ca2 Merge branch 'MDL-51267-master' of git://github.com/lameze/moodle 2016-04-19 11:53:22 +08:00
Simey Lameze
819e1ff0ad MDL-51267 mod_url: make the url and resource forms friendlier 2016-04-19 11:13:18 +08:00
Frederic Massart
69c478660a MDL-53451 competency: Properly wrap those nasty function declarations
Pheww, we avoided a disaster.
2016-04-19 10:55:46 +08:00
Andrew Nicols
383819375d Merge branch 'MDL-53779-master' of git://github.com/FMCorz/moodle 2016-04-19 10:32:56 +08:00