Commit graph

74272 commits

Author SHA1 Message Date
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
Marina Glancy
afc6a26938 MDL-49746 course: sorting users by last access 2015-08-11 16:15:58 +08:00
Frederic Massart
c855ced7bb MDL-42634 theme: Action menu is displayed correctly with hidden elements 2015-08-11 14:45:59 +08: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
Marina Glancy
10c82ca307 MDL-50881 calendar: do not throw exception without sesskey 2015-08-11 12:50:41 +08:00
John Okely
dd106c8824 MDL-37864 lib: Change help for headers to match existing table api 2015-08-11 12:18:21 +08:00
Marina Glancy
edbea936c5 MDL-37864 lib: corrections to help icon in tables 2015-08-11 12:18:21 +08:00
Sergey Rozhkov
3fed76e4df MDL-37864 lib: Help icon work correctly in table header with sorting 2015-08-11 12:18:20 +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
Ryan Wyllie
4829645724 MDL-46860 filepicker: change responsive styling
Changed the filepicker's responsive styling to kick in
on screen width less than 768px (which is the bootstrap
standard) rather than 873px. This allows the standard
styling to apply within an iframe.
2015-08-10 02:18:53 +00:00
Ryan Wyllie
d3065a3606 MDL-46860 filepicker: iframe context aware
The filepicker now checks if it's within an iframe when
creating the dialogue, if so it will set the dialogue width
to fit within the iframe and disable dragging.
2015-08-10 02:16:30 +00: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
Frederic Massart
ad606e6514 MDL-47450 blocks: Blocks can be moved on the site profile 2015-08-07 15:08:47 +08:00
AMOS bot
96274a3771 Automatically generated installer lang files 2015-08-07 00:03:59 +08:00
Michael Aherne
80dfcf49f5 MDL-51016 messaging: Fix email attachments on Windows 2015-08-06 12:53:17 +01: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
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