Commit graph

74303 commits

Author SHA1 Message Date
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
e3554c1c57 MDL-50999 dock: Stop adding commands to DOM
The commands div should not be added to the DOM. The version shown in the
dock is different to the standard version in the block, and is manually
added to the dock panel when it is displayed.

The docked version contains additional actions (e.g. the undock button).

The original version of the dock should ideally remain untouched.

Note: A duplicate delegation was discovered when fixing this issue. This
was previosuly not triggered because the watched Node was removed
before the delegation took effect.
2015-08-05 10:06:35 +08: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
Michael Aherne
bc9837241f MDL-49280 user: Config for allowing duplicate emails 2015-08-04 08:46:08 +01: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
Andrew Nicols
8e8e8de93d Merge branch 'MDL-50771' of git://github.com/stronk7/moodle 2015-08-04 10:19:04 +08:00
Andrew Nicols
1d1e95164d Merge branch 'MDL-50113-master' of git://github.com/jethac/moodle 2015-08-04 10:15:05 +08:00
Andrew Nicols
80692b4b68 Merge branch 'MDL-42626-master' of git://github.com/jleyva/moodle 2015-08-04 10:07:40 +08:00