Commit Graph

2828 Commits

Author SHA1 Message Date
Juan Leyva
145900708c MDL-54941 webservice: Refactor file handling in WS
This commit reduces boilerplate code.
It also forces WS returning files to always return the following
fields: filename, filepath, mimetype, filesize, timemodified and
fileurl.
2016-07-28 12:07:04 +02:00
Eloy Lafuente (stronk7)
8b13e09595 Merge branch 'wip-mdl-55337' of https://github.com/rajeshtaneja/moodle 2016-07-26 13:12:07 +02:00
Rajesh Taneja
4505459083 MDL-55337 behat: Added 1 sec delay between post
Ensure post is created at different timestamp, else
returned posts will be different and test fails.
This will happen on a fast machine.
2016-07-26 18:59:51 +08:00
Dan Poltawski
773a11519d Merge branch 'MDL-55278_master' of https://github.com/dmonllao/moodle 2016-07-26 11:57:09 +01:00
David Monllao
837cec00f9 Merge branch 'wip-mdl-55091-m' of https://github.com/rajeshtaneja/moodle
Conflicts:
	lib/upgrade.txt
2016-07-26 10:14:30 +08:00
Rajesh Taneja
52f3e060e4 MDL-55091 phpunit: Following has been deprecated.
1. getMock()
2. setExpectedException()
3. checkForUnintentionallyCoveredCode renamed to beStrictAboutCoversAnnotation
4. beStrictAboutTestSize renamed to enforceTimeLimit
5. UnitTestCase class is now fully removed.
2016-07-26 10:11:30 +08:00
David Monllao
0bd8383a8b MDL-55278 search: Updating references to area namespace 2016-07-21 18:38:18 +02:00
Eloy Lafuente (stronk7)
4feed61702 Merge branch 'MDL-55220-master' of git://github.com/jleyva/moodle 2016-07-19 13:21:36 +02:00
Andrew Nicols
d16185fd4f MDL-55173 mod_forum: Perform final deprecations 2016-07-18 08:42:33 +08:00
Juan Leyva
55bb8189ba MDL-55220 forum: Add string filtering in WS
The following external functions now filter the discussion and post
name and subject.
- get_forum_discussions_paginated
- get_forum_discussion_posts
2016-07-14 09:10:07 +01:00
David Monllao
034544ffda Merge branch 'MDL-18599-master' of git://github.com/junpataleta/moodle 2016-07-11 15:59:44 +02:00
Dan Poltawski
8846f9950f Merge branch 'MDL-55112-master' of git://github.com/junpataleta/moodle 2016-07-11 14:42:06 +01:00
Jun Pataleta
af0fc6a254 MDL-18599 mod_forum: Hide single discussion owner's name and picture
* On the discussion's page.
* On the recent activity block.
* On the recent activity page.
2016-07-11 21:40:19 +08:00
David Monllao
6a4c2146f9 MDL-53222 search: Replace report_search by new searchareas admin page 2016-07-11 11:49:14 +02:00
Juan Leyva
7ef49bd393 MDL-54951 webservice: Return intro text files in modules 2016-07-04 09:24:28 +01:00
Jun Pataleta
ca7e2fc21f MDL-55112 mod_forum: Query all forum fields to avoid debug messages 2016-07-04 15:22:56 +08:00
Dan Poltawski
ce63e9b2d7 Merge branch 'MDL-55002-master-enfix' of git://github.com/mudrd8mz/moodle 2016-06-29 15:05:25 +08:00
Helen Foster
25558b808e MDL-55002 lang: Merge English strings from the en_fix language pack 2016-06-27 22:03:40 +02:00
Eloy Lafuente (stronk7)
f780baf063 Merge branch 'MDL-54663-master' of git://github.com/andrewnicols/moodle 2016-06-27 13:26:34 +02:00
Andrew Nicols
d1a62a5046 MDL-54663 forum: Correct digest link to forum preferences 2016-06-22 13:11:23 +08:00
Eloy Lafuente (stronk7)
0f20bf7507 Merge branch 'wip-mdl-54589-mac' of https://github.com/rajeshtaneja/moodle 2016-06-22 01:42:15 +02:00
Rajesh Taneja
f55d87c55c MDL-54589 behat: Fixed failures for phantomjs standalone 2016-06-20 16:03:36 +08:00
Dan Poltawski
926ac16ef3 MDL-54654 mod: fix forum/scorm invalid css 2016-06-16 20:52:04 +01:00
Dan Poltawski
0fd08fc7e5 Merge branch 'MDL-35628' of https://github.com/mr-russ/moodle 2016-06-16 09:04:12 +01:00
Dan Poltawski
4f400df523 Merge branch 'MDL-54036_master' of https://github.com/liorgil/moodle 2016-06-16 09:04:09 +01:00
Russell Smith
1fcf0ca8a5 MDL-35628 performance: Remove dirname() where possible.
dirname() is a slow function compared with __DIR__ and using
'/../'.  Moodle has a large number of legacy files that are included
each time a page loads and is not able to use an autoloader as it is
functional code.  This allows those required includes to perform as
best as possible in this situation.
2016-06-10 08:06:49 +10: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