Commit graph

2803 commits

Author SHA1 Message Date
Dan Poltawski
4f400df523 Merge branch 'MDL-54036_master' of https://github.com/liorgil/moodle 2016-06-16 09:04:09 +01:00
Dan Poltawski
654e77e74d MDL-54729 mod_forum: clarify static variable usage
After some time discussing with integrators, we decided that this
slightly yukky solution probably fits safely, so just making its usage
better explained and speciifc.
2016-06-07 10:46:53 +01:00
Adrian Greeve
09fec72819 MDL-54729 mod_forum: Deep link highlighting works in IE. 2016-06-07 10:30:18 +01:00
David Monllao
4024b94d17 Merge branch 'MDL-54675-forum-highlight' of https://github.com/brendanheywood/moodle 2016-05-24 14:20:13 +08:00
Brendan Heywood
d0d6902a72 MDL-54675 forum: Fixed bug with multiple adjacent hash anchors 2016-05-24 13:07:07 +10:00
Eloy Lafuente (stronk7)
4da854a68b MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:31:34 +02:00
Dan Poltawski
c56d14be37 Merge branch 'MDL-54627_master' of git://github.com/dmonllao/moodle 2016-05-19 10:59:06 +01:00
David Monllao
505ce88467 MDL-54627 search: Ensure that all format_string strings are text.
All user input that is usually displayed through format_strings with
filters like mulitlang applied should be converted to text as well.
2016-05-19 13:16:01 +08:00
Eloy Lafuente (stronk7)
1abca11e0a MDL-54638 versions: bump all versions and requires near release
version = 2016052300 release version
requires= 2016051900 current rc1 version
2016-05-19 02:16:15 +02:00
Dan Poltawski
53b540c82a Merge branch 'MDL-54027-master' of git://github.com/FMCorz/moodle 2016-05-18 11:05:06 +01:00
David Monllao
c827acae2d MDL-53221 search: Renaming search areas
AMOS BEGIN
 CPY [modulename,mod_folder],[search:activity,mod_folder]
 CPY [modulename,mod_label],[search:activity,mod_label]
 CPY [modulename,mod_page],[search:activity,mod_page]
 CPY [modulename,mod_resource],[search:activity,mod_resource]
 CPY [modulename,mod_url],[search:activity,mod_url]
AMOS END
2016-05-16 13:02:02 +08:00
Frederic Massart
2140cca1db MDL-54027 mod_forum: Display sub-header on user posts/discussions page 2016-05-13 17:17:28 +08:00
Andrew Nicols
e90e0ea570 MDL-53755 forum: Check session when marking posts 2016-05-06 09:27:26 +08:00
Andrew Nicols
6b587d2be2 MDL-53696 forum: Check discussion in forum 2016-05-06 09:27:25 +08:00
liorgi
68873d48be MDL-54036 mod_forum: Remove unused variable in forum_print_posts_flat 2016-05-03 16:30:58 +03:00
David Monllao
f74e3ace69 Merge branch 'MDL-53980-master-enfix' of git://github.com/mudrd8mz/moodle 2016-05-02 10:46:50 +08:00
Helen Foster
a5061bf7b7 MDL-53980 lang: Merge English strings from the en_fix language pack 2016-04-28 18:32:03 +02:00
Cameron Ball
f23e9b6ba4 MDL-49414 webservices: Remove deprecated functions 2016-04-27 15:54:38 +08:00
David Monllao
65f9001d31 Merge branch 'MDL-48089-master' of git://github.com/danpoltawski/moodle 2016-04-20 12:24:07 +08:00
David Monllao
d7eb33652f Merge branch 'MDL-53702_master' of https://github.com/liorgil/moodle 2016-04-20 11:10:23 +08:00
Eloy Lafuente (stronk7)
3a97e39825 Merge branch 'MDL-53660-master' of git://github.com/danpoltawski/moodle 2016-04-20 01:19:58 +02:00
Ben Kelada
48143990e0 MDL-53345 forum: rename itemid 2016-04-18 11:04:57 +10:00
Ben Kelada
e881c4f5c3 MDL-53345 forum: Add attachmentareaid to support attachments in api 2016-04-18 11:04:57 +10:00
Ben Kelada
41182118ae MDL-53345 forum: Add item id as parameter to support inline attachments 2016-04-18 11:04:57 +10:00
liorgi
db3a6216cc MDL-48089 mod_forum: Improve DB query in observer 2016-04-14 14:20:32 +01:00
David Monllao
3dd89357d4 Merge branch 'MDL-53772-master' of git://github.com/damyon/moodle
Conflicts:
	lib/upgrade.txt
2016-04-14 14:01:16 +08:00
Damyon Wiese
56fa860ead MDL-53772 externallib: Fix busted webservices context handling
Fix:
$PAGE->context must be reset when calling validate_context

Improve:
Provide wrapper for calling an external function

The wrapper correctly checks the function parameters and return type against
the description of the external function, and stores the PAGE and COURSE global
state variables, restoring them before the function returns.

Fix: buggy unit tests.

These tests are expecting debugging from a bug that was fixed, and calling web
service functions with no user or session.
2016-04-14 13:58:23 +08:00
Mark Nielsen
39b2d8700d MDL-53660 mod_forum: Fix coding style 2016-04-13 15:59:45 +01:00
Mark Nielsen
9258045b9b MDL-53660 mod_forum: Fix link decoding in single discussions
This only happens when user data is not included.
2016-04-13 15:59:44 +01:00
Andrew Nicols
c0e3c8ae0d MDL-52942 forum: Allow posting to multiple groups in eachuser forums 2016-04-11 12:23:47 +08:00
liorgi
73dcd8282a MDL-53702 mod_forum: Remove unused variables 2016-04-10 08:51:57 +03:00
liorgi
7664fe2efb MDL-53702 mod_forum: Remove unused variables 2016-04-07 17:34:18 +03:00
Rajesh Taneja
eb9ca848fa MDL-53381 behat: Replaced chained steps with api.
Behat 3.x doesn't support chained steps and hence
this is first step to get rid of chained steps in core.
2016-04-06 11:32:49 +08:00
Dan Poltawski
9d6e3cb6c0 Merge branch 'MDL-17955-master' of git://github.com/andrewnicols/moodle 2016-04-04 09:01:46 +01:00
Matteo Scaramuccia
2e385e9c57 MDL-53622 mod_forum: Added the file_rewrite_pluginfile_urls() call. 2016-04-01 22:41:25 +02:00
Andrew Nicols
c71d185658 MDL-17955 forum: Remove timed postings from experimental
This commit does two things:
1) remove the note about the feature being experimental; and
2) changes the default to be enabled for new sites.

This will not enable the feature for existing sites where it is not
enabled.
2016-03-29 15:39:58 +08:00
Dan Poltawski
868e5ef0d5 Merge branch 'MDL-53515-master' of git://github.com/merrill-oakland/moodle 2016-03-29 14:39:53 +08:00
Dan Poltawski
35689b71a8 Merge branch 'MDL-53562-forum-reply-re' of https://github.com/brendanheywood/moodle 2016-03-26 10:35:55 +08:00
Eric Merrill
091973dbd7 MDL-53515 search: Extend search API to allow file indexing 2016-03-24 15:44:27 -04:00
Brendan Heywood
318e5cb302 MDL-53562 forum: Fixed missing forum subject Re: prefix 2016-03-21 19:41:40 +11:00
David Monllao
7960ad0571 Merge branch 'MDL-53509-master' of git://github.com/andrewnicols/moodle 2016-03-21 08:42:58 +08:00
Andrew Nicols
48a9ef9e96 MDL-53509 mod_forum: Stop over-escaping quoted variables
{{# quote }}<a href=\"foo\">{{/ quote }}

becomes:

    "<a href=\\"foo\\">"

This causes a mustache syntax error.

The quote helper negates the need to escape quotes in normal use, e.g.:

    {{# quote }}<a href="foo">{{/ quote }}

which instead becomes:

    "<a href=\"foo\">"
2016-03-17 08:33:48 +08:00
Eloy Lafuente (stronk7)
3edc162611 Merge branch 'MDL-53354-master' of git://github.com/merrill-oakland/moodle 2016-03-16 01:09:45 +01:00
David Monllao
c854ce6eb7 Merge branch 'MDL-53102-messageid' of https://github.com/brendanheywood/moodle 2016-03-14 14:17:41 +08:00
Brendan Heywood
54dceeed88 MDL-53102 email: Ensure all emails generate consistent Message-ID URLs 2016-03-14 14:20:10 +11:00
Rajesh Taneja
42ad096fdb MDL-46891 Behat: Added support for behat 3 2016-03-11 10:51:15 +08:00
Eric Merrill
f6b425e2de MDL-53354 search: Add ability to limit search doc to a user 2016-03-10 09:19:05 -05:00
Juan Leyva
0ca559a111 MDL-50032 webservice: Remove plugin functions from mobile service 2016-03-04 14:15:33 +01:00
Dan Poltawski
5be405fa4a MDL-53050 mod_forum: fix for base highlight 2016-03-02 17:18:51 +08:00
Eloy Lafuente (stronk7)
ce878562f3 Merge branch 'MDL-52136-master' of git://github.com/andrewnicols/moodle 2016-03-02 05:25:57 +01:00