David Monllao
819ab257f7
Merge branch 'MDL-46321-master' of git://github.com/tonyjbutler/moodle
2015-08-12 08:49:14 +08:00
David Monllao
c68b32067e
MDL-50839 user: realuseravatar should also read avatarsize
2015-08-12 08:39:07 +08:00
David Monllao
f2e50523d1
Merge branch 'MDL-50839-master' of git://github.com/Dave-B/moodle
2015-08-12 08:32:11 +08:00
David Monllao
3718d2cd17
Merge branch 'MDL-50947_master' of git://github.com/moodlerooms/moodle
2015-08-12 08:30:03 +08:00
David Monllao
fb41850a3c
Merge branch 'MDL-50720' of git://github.com/bostelm/moodle
2015-08-12 08:27:09 +08:00
David Monllao
ede96605ac
Merge branch 'MDL-51053-master' of git://github.com/sammarshallou/moodle
2015-08-12 08:23:29 +08:00
Eloy Lafuente (stronk7)
20c50b0d5c
Merge branch 'MDL-50062-master' of git://github.com/FMCorz/moodle
2015-08-12 01:52:04 +02:00
Eloy Lafuente (stronk7)
4da133199f
Merge branch 'MDL-50430' of https://github.com/danielneis/moodle
2015-08-12 00:48:07 +02:00
Eloy Lafuente (stronk7)
1dce5c99c8
Merge branch 'MDL-50446-master' of git://github.com/ryanwyllie/moodle
2015-08-12 00:11:42 +02:00
Eloy Lafuente (stronk7)
b7759a1889
Merge branch 'MDL-50307-master-3' of git://github.com/xow/moodle
2015-08-11 23:44:50 +02:00
Eloy Lafuente (stronk7)
789d40a803
Merge branch 'MDL-49293-master' of git://github.com/andrewnicols/moodle
2015-08-11 22:58:09 +02:00
Eloy Lafuente (stronk7)
30deee105c
Merge branch 'MDL-50642' of https://github.com/ecampbell/moodle
2015-08-11 22:32:11 +02:00
Sam Chaffee
5222ab7f4b
MDL-50947 mod_lti Add removed grade.php to upgrade_stale_php_files_present
2015-08-11 10:42:08 -06:00
Sam Chaffee
4180d9706b
MDL-50947 mod_lti Remove deprecated grade.php
2015-08-11 10:30:06 -06:00
sam marshall
27479b5cc9
MDL-51053 Restore: Static cache breaks unit tests
2015-08-11 14:07:38 +01:00
David Balch
9dcd50358a
MDL-50839 user_menu: Allow themes to set User menu avatar size.
...
Added an @array "options" parameter to user_get_user_navigation_info(),
for passing in avatarsize, and possibly other options in future.
Also removed an errant parameter in the /lib/outputrenderers.php
user_get_user_navigation_info() call, as there was no corresponding
parameter in the function definition.
(Test written by Jetha Chan.)
2015-08-11 13:57:17 +01:00
Eloy Lafuente (stronk7)
1877b7551e
Merge branch 'MDL-50894_master' of https://github.com/gedion/moodle
2015-08-11 14:18:34 +02:00
Eloy Lafuente (stronk7)
99c582a19f
Merge branch 'master_MDL-51015' of git://github.com/danmarsden/moodle
2015-08-11 14:09:42 +02:00
Henning Bostelmann
0bec64c6a1
MDL-50720 mod_data: Highlight non-approved entries
2015-08-11 11:30:02 +01:00
David Monllao
b84129b11e
Merge branch 'MDL-50956' of git://github.com/bostelm/moodle
2015-08-11 13:20:11 +08:00
David Monllao
8c497d8d9f
Merge branch 'MDL-51014-master' of git://github.com/sammarshallou/moodle
2015-08-11 13:08:11 +08:00
John Okely
78a713685d
MDL-50307 auth_db: Stop using AS to prevent error with some drivers
2015-08-11 12:11:43 +08:00
John Okely
c8bde450a1
MDL-50307 auth_db: Fix associative fetching in ADODB 2.19
2015-08-11 12:11:43 +08:00
Rajesh Taneja
b9432e1a7d
MDL-50926 phpunit: Advanced testcase should extend base_testcase
2015-08-11 02:37:28 +02:00
Tony Levi
b80b35d0fc
MDL-50926 phpunit: Upgrade to phpunit 4.x
2015-08-11 02:35:11 +02:00
Daniel Neis Araujo
54cf94390b
MDL-50430 forum: Add number of subscribers to forum subscriber list
2015-08-10 14:17:10 -03:00
Mark Johnson
c5639c9118
MDL-51014 behat: Wait for filepicker to load repository
2015-08-10 13:37:24 +01:00
Tony Butler
5a699f25a2
MDL-46321 mod_forum: Remove move button to force destination selection
2015-08-10 11:00:00 +01:00
David Monllao
f5d23fc162
Merge branch 'wip-MDL-51062-master' of git://github.com/marinaglancy/moodle
2015-08-10 14:23:42 +08:00
David Monllao
3f3bf3dbbe
Merge branch 'MDL-50992-master' of git://github.com/damyon/moodle
2015-08-10 11:17:30 +08:00
David Monllao
583ef1966a
Merge branch 'MDL-51007-master' of git://github.com/sammarshallou/moodle
2015-08-10 11:07:43 +08:00
Andrew Nicols
6270f4dbdd
MDL-50949 cache: Improve cache performance tests
2015-08-10 08:04:03 +08:00
Andrew Nicols
340d2a7178
Merge branch 'MDL-50949-master' of git://github.com/FMCorz/moodle
2015-08-10 08:03:11 +08:00
Marina Glancy
7f0c7f01c0
MDL-51062 behat: permission steps should work without js
2015-08-09 20:33:27 +08:00
Dan Marsden
524aaa177a
MDL-51015 mod_scorm: tidy up messy code, remove use of eval()
2015-08-06 22:20:05 +12:00
Andrew Nicols
57739a72cb
weekly release 3.0dev
2015-08-06 12:11:01 +08:00
Andrew Nicols
43f7391881
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2015-08-06 12:10:54 +08:00
Frederic Massart
b13afc368e
MDL-50062 behat: Handle category mapping for grade items generator
2015-08-06 11:56:44 +08:00
Frederic Massart
ca81f8c4b2
MDL-50062 grades: Behat tests for aggregation changes
2015-08-06 11:56:44 +08:00
Frederic Massart
e1c5d6618d
MDL-50062 grades: Fix false positives in Behat tests
2015-08-06 10:24:26 +08:00
Frederic Massart
01a088e0a2
MDL-50062 grades: Tests for item::set_aggregation_fields_for_aggregation
2015-08-06 10:24:25 +08:00
Frederic Massart
5419cbc9eb
MDL-50062 grades: Carry agg. settings between categories when possible
2015-08-06 10:24:25 +08:00
Dave Cooper
135efd5116
MDL-50062 gradebook: Fixed behaviour when changing aggregation mathods.
2015-08-06 10:24:25 +08:00
Andrew Nicols
411e7eacd0
Merge branch 'MDL-50113-integration-fixup' of https://github.com/jethac/moodle
2015-08-06 09:42:43 +08:00
Eloy Lafuente (stronk7)
6d2ccd352f
Merge branch 'MDL-44840-master' of git://github.com/lameze/moodle
2015-08-05 20:46:59 +02:00
Eoin Campbell
dcd4464ea3
MDL-50642 qformat_xml: fix import of tags in Cloze questions
2015-08-05 19:11:11 +01:00
Eloy Lafuente (stronk7)
72d3fd1035
Merge branch 'MDL-50816-master' of git://github.com/jleyva/moodle
2015-08-05 18:20:52 +02:00
AMOS bot
ddcd67022b
Automatically generated installer lang files
2015-08-06 00:04:12 +08:00
AMOS bot
20f203e1d5
Automatically generated installer lang files
2015-08-06 00:04:12 +08:00
Eloy Lafuente (stronk7)
aa29bb3ba0
Merge branch 'MDL-48970' of https://github.com/andrewhancox/moodle
2015-08-05 16:11:47 +02:00
