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
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
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
Mark Johnson
c5639c9118
MDL-51014 behat: Wait for filepicker to load repository
2015-08-10 13:37:24 +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
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
sam marshall
362616ae6c
MDL-51007 Availability: Unit test fails with extra plugins
2015-08-05 14:27:40 +01:00
Eloy Lafuente (stronk7)
f72a201884
Merge branch 'MDL-38230' of git://github.com/jmvedrine/moodle
2015-08-05 12:38:51 +02:00
Jetha Chan
70465d09ff
MDL-50113 message: responsive and long name fixups
...
Addresses responsive inconsistency on Firefox, also fixes display
of names which are long and don't have whitespace to break on.
2015-08-05 16:38:57 +09:00
Andrew Nicols
b167057c8a
Merge branch 'MDL-48202-M30' of git://github.com/lazydaisy/moodle
2015-08-05 08:23:01 +08:00
Eloy Lafuente (stronk7)
ad9a7604f9
MDL-35027 mod_forum: verify forced subscriptions cannot be edited
...
This commit adds a new scenario to verify that the option
to turn edition of subscribers is not available anymore
for forced-subscription activities.
It also gets rid of the @javascript tag in a just introduced
scenario not needing it.
2015-08-05 02:05:37 +02:00
Eloy Lafuente (stronk7)
caf6577e7f
Merge branch 'MDL-35027-B' of https://github.com/bostelm/moodle
2015-08-05 01:15:59 +02:00
Eloy Lafuente (stronk7)
6573ba3e27
MDL-44273 block_rss: Prevent PHP notices in tests + whitespace fix
2015-08-05 00:55:28 +02:00
Eloy Lafuente (stronk7)
f2755d847e
Merge branch 'MDL-44273' of https://github.com/NeillM/moodle
2015-08-04 20:24:00 +02:00
Eloy Lafuente (stronk7)
1f65da81f5
Merge branch 'MDL-50416-master' of git://github.com/lameze/moodle
2015-08-04 20:04:27 +02:00
Eloy Lafuente (stronk7)
569d879df8
MDL-46963 env: adding missing check_database_tables_row_format check
2015-08-04 19:48:02 +02:00
Eloy Lafuente (stronk7)
07b8df8b1e
MDL-50624 env: adding missing restrict_php_version_7 check
2015-08-04 19:31:01 +02:00
Bruce Silver
01c7ba4b82
MDL-50992 lti: Fix debugging warning when creating a new tool
2015-08-04 22:15:03 +08:00
Neill Magill
83f215850e
MDL-44273 block_rss: Back-off strategy for RSS feeds
...
Based on a patch by Davo Smith of Synergy Learning
RSS feeds can fail, either permanently or temporarily.
After this patch if a feed fails it will not be tried again in the next cron run.
If it continues to fail the delay between tries will be increased.
When a feed succeeds it will go back to being fetched on each cron run.
This should make the CRON process for RSS feeds finish faster when
there are lots of invalid feeds.
2015-08-04 11:04:29 +01:00
Andrew Nicols
3c81333aa4
Merge branch 'MDL-50008-master' of git://github.com/jleyva/moodle
2015-08-04 16:20:55 +08:00
Andrew Nicols
121eaa6cfe
Merge branch 'MDL-49792-master' of git://github.com/jleyva/moodle
2015-08-04 16:17:43 +08:00
Andrew Nicols
673b3c730b
Merge branch 'MDL-49791-master' of git://github.com/jleyva/moodle
2015-08-04 16:07:11 +08:00
Andrew Nicols
b7fafb5aae
Merge branch 'MDL-50893' of git://github.com/timhunt/moodle
2015-08-04 15:59:05 +08:00
Andrew Nicols
719af68938
Merge branch 'wip-MDL-45113-master' of https://github.com/mackensen/moodle
2015-08-04 15:21:22 +08:00
Andrew Nicols
259ca15a2d
Merge branch 'MDL-43709-master' of https://github.com/pauln/moodle
2015-08-04 12:26:12 +08:00
Andrew Nicols
ac41247254
Merge branch 'MDL-50532-master' of git://github.com/FMCorz/moodle
2015-08-04 12:09:30 +08:00
Andrew Nicols
45f8f3e372
MDL-50493 mod_forum: Correct style issues
2015-08-04 11:53:04 +08:00
Andrew Nicols
b9e4972c7a
Merge branch 'MDL-50493-master' of git://github.com/jleyva/moodle
2015-08-04 11:46:14 +08:00
