74081 Commits

Author SHA1 Message Date
Damyon Wiese
08bda175de MDL-51213 weblib: Allow filter=false option for format_string
And pass this from external_format_string correctly.
2015-09-10 12:55:52 +08:00
Damyon Wiese
3676873566 MDL-51213 webservice: Fix wrong use of external_format_text
Was passing cm->id instead of context->id.
2015-09-10 12:13:02 +08:00
Damyon Wiese
9764aab9da MDL-51213 externallib: external_format_text/external_format_string
API functions do not know if they are being called from a web page, or a
web-service. They need a single function to call to correctly apply
filters, strip tags etc that knows the correct way to do this based on
the way it was called (e.g. webservices allow parameters for skipping
filters etc).

So here we are fixing the default for the filter argument used in
external_format_text and adding a matching external_format_string.
2015-08-27 15:56:36 +08: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
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
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
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
Andrew Nicols
fec4959809 Merge branch 'MDL-45772-master-4' of git://github.com/xow/moodle 2015-08-04 09:56:47 +08:00
John Okely
380001929a MDL-45772 admin: Stop browsers from autofilling passwords incorrectly 2015-08-04 09:54:34 +08:00
Simey Lameze
de5c8d90af MDL-50416 environment: add missing slasharguments checks 2015-08-04 09:31:47 +08:00
Eloy Lafuente (stronk7)
4d3dc631d4 Merge branch 'MDL-50515' of git://github.com/jmvedrine/moodle 2015-08-04 01:21:16 +02:00
Eloy Lafuente (stronk7)
7b82add579 Merge branch 'wip-MDL-19748-master' of https://github.com/marinaglancy/moodle 2015-08-03 21:20:04 +02:00
AMOS bot
5488871e5d Automatically generated installer lang files 2015-08-04 00:04:20 +08:00
Henning Bostelmann
e143918f9e MDL-35027 mod_forum: Fix subscriber list in hidden forums
If the forum is force-subscribed and hidden, only subscribers that can
view hidden activities will be shown in the subscriber list.
2015-08-03 12:12:56 +01:00
Eloy Lafuente (stronk7)
0e1615dfef Merge branch 'MDL-50572-master' of git://github.com/junpataleta/moodle 2015-08-03 12:58:35 +02:00