Dan Poltawski
9835839186
Merge branch 'MDL-46124-master' of git://github.com/FMCorz/moodle
2014-12-23 10:20:44 +00:00
Dan Poltawski
d890b55de1
Merge branch 'MDL-42616-master-fixup' of https://github.com/FMCorz/moodle
2014-12-23 09:51:31 +00:00
Frederic Massart
7f63c934a2
MDL-46183 theme_more: Background is seen through the activity chooser
2014-12-23 17:15:49 +08:00
Ankit Agarwal
9802bd616e
MDL-48697 libraries: Use proper path for core_completion
2014-12-23 13:29:58 +05:30
Frederic Massart
ae46ca5fcc
MDL-42616 core: Adding tool_filetypes to the standard plugins list
2014-12-23 12:04:02 +08:00
Eloy Lafuente (stronk7)
093c161d46
Merge branch '45699-29' of git://github.com/samhemelryk/moodle
...
Conflicts:
cache/upgrade.txt
2014-12-23 02:01:36 +01:00
Eloy Lafuente (stronk7)
57bd925603
MDL-48568 cache: make tests aware of default application store
...
When an alternative cache configuration is used, aka:
define('TEST_CACHE_USING_ALT_CACHE_CONFIG_PATH', true);
$CFG->altcacheconfigpath = '/tmp/xxxxx.php';
the get_expected_application_cache_store() method was not able of
retroffiting the default application store being used.
This commit just implements that functionality so, when
executing unit tests using alternative configuration, assertions
looking for that will pass without a problem.
2014-12-23 01:34:35 +01:00
Eloy Lafuente (stronk7)
88abb346a3
Merge branch '48568-29' of git://github.com/samhemelryk/moodle
2014-12-23 01:34:12 +01:00
Eloy Lafuente (stronk7)
2323289e2e
Merge branch 'MDL-48593-master' of git://github.com/andrewnicols/moodle
2014-12-22 21:50:50 +01:00
Tim Hunt
46e4c35aa9
MDL-42519 qformat_xml: Correctly export questions containing ]]>
2014-12-22 19:46:23 +00:00
Eloy Lafuente (stronk7)
b44a858ff1
Merge branch 'MDL-48639' of git://github.com/timhunt/moodle
2014-12-22 19:09:43 +01:00
Dan Poltawski
a62de06e57
Merge branch 'MDL-40864-M29' of git://github.com/lazydaisy/moodle
2014-12-22 17:29:43 +00:00
Dan Poltawski
1de86bf5b9
Merge branch 'MDL-25979_master' of https://github.com/crazyserver/moodle
2014-12-22 17:27:08 +00:00
Dan Poltawski
38da9a45e8
Merge branch 'master-48421' of https://github.com/timpricecatalyst/moodle
2014-12-22 17:00:19 +00:00
Dan Poltawski
f957ec61ca
Merge branch 'MDL-43730-master' of git://github.com/ankitagarwal/moodle
2014-12-22 16:34:48 +00:00
Dan Poltawski
affdc3b7e6
MDL-48638 course: update unit test to new message
2014-12-22 16:23:04 +00:00
Dan Poltawski
427f70a8d3
Merge branch 'MDL-42166-master' of git://github.com/xow/moodle
2014-12-22 15:38:49 +00:00
Dan Poltawski
677172f722
Merge branch 'MDL-48638-master' of git://github.com/merrill-oakland/moodle
2014-12-22 15:25:25 +00:00
Dan Poltawski
ca9ef112c6
Merge branch 'MDL-48643-master' of git://github.com/merrill-oakland/moodle
2014-12-22 15:22:37 +00:00
Dan Poltawski
e51f99739d
MDL-43004 blog: fix upgrade.txt typo
2014-12-22 15:13:41 +00:00
Dan Poltawski
991d2e9633
Merge branch 'MDL-43004-master' of git://github.com/FMCorz/moodle
2014-12-22 15:09:53 +00:00
Dan Poltawski
7293a1aafd
MDL-44260 uplodate: move deprecated functions to deprecatedlib
2014-12-22 15:07:59 +00:00
Dan Poltawski
65a19504d7
Merge branch 'MDL-44260-master' of git://github.com/lameze/moodle
2014-12-22 14:57:30 +00:00
Dan Poltawski
7f384c8f92
Merge branch 'MDL-48062-master' of https://github.com/dthies/moodle
2014-12-22 14:36:46 +00:00
Dan Poltawski
b21575c753
Merge branch 'm29_MDL-48423' of https://github.com/totara/moodle
2014-12-22 14:15:09 +00:00
Dan Poltawski
1f2789ebf2
Merge branch 'MDL-48224-master' of git://github.com/xow/moodle
2014-12-22 14:04:05 +00:00
Dan Poltawski
2da35cd459
Merge branch 'MDL-48445-master' of https://github.com/jmarshall-netspot/moodle
2014-12-22 13:56:19 +00:00
Dan Poltawski
b8572fa904
Merge branch 'MDL-48534_master' of https://github.com/markn86/moodle
2014-12-22 13:52:36 +00:00
Dan Poltawski
172d7f16ce
Merge branch 'm29_MDL-48483' of https://github.com/totara/moodle
2014-12-22 13:43:51 +00:00
Dan Poltawski
e9db67b43a
Merge branch 'MDL-48580-master' of git://github.com/lameze/moodle
2014-12-22 13:41:11 +00:00
Dan Poltawski
d61ecfffe5
Merge branch 'patch-1' of https://github.com/jrchamp/moodle
2014-12-22 13:37:52 +00:00
Dan Poltawski
e04cf8d83f
MDL-48653 behat: fix incorrect phpdoc
2014-12-22 13:12:48 +00:00
Dan Poltawski
6a96178bc0
Merge branch 'MDL-48653' of git://github.com/timhunt/moodle
2014-12-22 13:10:44 +00:00
Dan Poltawski
0a6ac6e2d9
Merge branch 'MDL-48088-master' of git://github.com/jethac/moodle
2014-12-22 13:05:51 +00:00
Dan Poltawski
c67c00a6fe
Merge branch 'MDL-42616-master' of https://github.com/sammarshallou/moodle
2014-12-22 12:13:31 +00:00
Dan Poltawski
d29f655a99
Merge branch 'MDL-48666' of git://github.com/timhunt/moodle
2014-12-22 11:53:15 +00:00
Dan Poltawski
f9b7d0bfac
Merge branch 'MDL-48244' of git://github.com/jmvedrine/moodle
2014-12-22 11:16:41 +00:00
pau.ferrer-ocana
90e30644d5
MDL-48080 email: Do not send to .invalid addresses. It is an invalid TLD
2014-12-22 10:41:58 +01:00
pau.ferrer-ocana
f1c4e3d2ba
MDL-48080 email: Remove some old error_log calls
2014-12-22 10:41:57 +01:00
Pau Ferrer Ocaña
3256b358cb
MDL-25979 signup: Usability message for recaptcha label form
2014-12-22 10:40:17 +01:00
Andrew Davis
7120494ea1
MDL-48441 core_user: profile.php, view.php now handle guests the same
2014-12-22 09:26:59 +01:00
Ankit Agarwal
6deca428d2
MDL-48688 inbound: Fix incorrect class names
2014-12-22 13:37:48 +05:30
Adrian Greeve
fdc934a165
MDL-48523 gradebook: Fix for incorrect behat steps.
2014-12-22 15:00:18 +08:00
Eric Merrill
6f0776b6ff
MDL-48643 Javascript: Create modals hidden, then show, to prevent scroll
...
Modal dialogs need to be created with visible: false and then call
.show() on it to make it visible. This prevents the page from jumping to
the top.
2014-12-21 22:54:25 -05:00
Petr Skoda
30f6c4c023
MDL-48665 login: Fix detection of reused password
2014-12-21 18:22:24 +01:00
AMOS bot
e13a0147bc
Automatically generated installer lang files
2014-12-22 00:04:08 +08:00
Jean-Michel Vedrine
25345cb4cd
MDL-48244 Lesson: add custom end of lesson reached completion rule
2014-12-21 16:23:49 +01:00
AMOS bot
1a58acd075
Automatically generated installer lang files
2014-12-21 00:04:00 +08:00
AMOS bot
6bb673bb68
Automatically generated installer lang files
2014-12-20 00:04:12 +08:00
sam marshall
d3fd2be7aa
MDL-42616 filelib: New user interface to edit and add file types (2/2)
...
New admin tool tool_filetypes which uses the new API to add and
modify file type definitions.
2014-12-19 14:49:01 +00:00
