93930 Commits

Author SHA1 Message Date
Jun Pataleta
1525b9626e Merge branch 'MDL-60407-master' of git://github.com/vmdef/moodle 2019-05-21 18:44:52 +08:00
Simey Lameze
2b815157c9 MDL-59650 core_calendar: remove limit from calendar UI 2019-05-21 15:22:13 +08:00
Simey Lameze
e099259a46 MDL-59650 core_calendar: remove limit from event exporter 2019-05-21 15:22:09 +08:00
Adrian Greeve
2c0ac767c6 Merge branch 'MDL-65572-master' of git://github.com/damyon/moodle 2019-05-21 15:19:29 +08:00
Andrew Nicols
5b16520936 Merge branch 'MDL-65644' of git://github.com/stronk7/moodle 2019-05-21 12:49:32 +08:00
Shamim Rezaie
26206ddc78 MDL-65590 tool_customlang: Escape html on the standard text field 2019-05-21 14:20:16 +10:00
Adrian Greeve
04de0e85a0 Merge branch 'MDL-65655-37-forumcroninactiveusers' of git://github.com/mudrd8mz/moodle 2019-05-21 11:42:13 +08:00
AMOS bot
f2f1dcb56e Automatically generated installer lang files 2019-05-21 00:12:47 +00:00
AMOS bot
21637e54c9 Automatically generated installer lang files 2019-05-21 00:12:47 +00:00
Eloy Lafuente (stronk7)
a8b2f03d8b MDL-64530 travis: Enabble PHP 7.3 and redis cache
This commit performs a number of changes:

- Enables PHP 7.3, replacing PHP 7.2 (max/min approach).
- Enables back the redis service
- Configures redis cache store tests to be run.
- Disables redis session tests for PHP 7.2 and up (MDL-60978)
2019-05-21 01:24:11 +02:00
Eloy Lafuente (stronk7)
3572a25cc3 MDL-65644 upgrade: add 3.7.0 separation line to all upgrade scripts 2019-05-20 19:35:05 +02:00
David Mudrák
e31f62a788 MDL-65655 forum: Do not send notifications to inactive users
We cannot deliver notifications to users who had subscribed to a forum
or discussion and were later inactivated either by suspending or setting
the auth method to nologin. The deliver adhoc task cannot be run as
these users, throwing the "Suspended account" exception.

The solution is to make sure that fetch_subscribed_users() does not
include those inactive users.
2019-05-20 18:46:35 +02:00
Shamim Rezaie
1806f70cbb MDL-65591 tool_customlang: Re-adding the save buttons at the bottom 2019-05-21 02:20:20 +10:00
Daniel Neis Araujo
3cbec0b81a MDL-65654 tool_uploaduser: Fix undefined variable warning 2019-05-20 12:44:05 -03:00
Juan Leyva
ee766461b4 MDL-65274 mod_quiz: Do not return a translated string
We should be returning proper error codes and the translated string can be part of the debug information.
2019-05-20 15:50:46 +02:00
Shamim Rezaie
c7ac83ca0a MDL-65605 core_question: Fix the issue when get_draft_files returns nul 2019-05-20 23:44:02 +10:00
Shamim Rezaie
a9d62c4513 MDL-65605 mod_lesson: Fix the issue when get_draft_files returns null 2019-05-20 23:43:59 +10:00
Shamim Rezaie
80c360d573 MDL-65630 mod_quiz: Allow redo within an attempt with random questions 2019-05-20 23:10:30 +10:00
Shamim Rezaie
2e68255609 MDL-65630 mod_quiz: Move logging in to the start of tests
The background is for set up, the scenario is for the test. Logging in
to start the test is the start of the test and the end of the background
itself.
2019-05-20 23:10:11 +10:00
Andrew Nicols
8053b88145 Merge branch 'MDL-65643' of git://github.com/stronk7/moodle 2019-05-20 14:24:49 +08:00
Damyon Wiese
e7f9ae50e5 MDL-65572 messaging: Loginas upgrade check
When using login as, we also need to check if there are legacy messages that
need updating and set the user preference if required.
2019-05-20 09:12:40 +08:00
Eloy Lafuente (stronk7)
795304597f MDL-65643 backup: Bump release to 3.8 2019-05-19 21:11:05 +02:00
Eloy Lafuente (stronk7)
a866c5c238 weekly back-to-dev release 3.8dev 2019-05-19 11:24:14 +02:00
Eloy Lafuente (stronk7)
89457b26d1 Moodle release 3.7 v3.7.0 2019-05-19 11:18:34 +02:00
Eloy Lafuente (stronk7)
374c1763ba NOBUG: Change travis.yml back to master 2019-05-19 11:18:34 +02:00
Eloy Lafuente (stronk7)
c0f098cd57 NOBUG: Change travis.yml to MOODLE_37_STABLE 2019-05-19 11:18:34 +02:00
Eloy Lafuente (stronk7)
a67061dc4a Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2019-05-19 11:18:30 +02:00
Eloy Lafuente (stronk7)
117e4bd40d MDL-65635 forum: Small improvement to the submit inline-reply
This commit mimics 100% the behavior achieved with the
parent commit of this when using the advance option.

1) Rename the 'tohtml' option to 'topreferredformat' to better
represent what it's doing.

2) Always honor the preferred format (this is a new post).

3) Only perform the conversion to HTML when the preferred format is
HTML.

That way any user, no matter thy are using format MOODLE (plain textbox),
MARKDOWN (marklar editor) or HTML (atto and tinymce editor) will
get always the format correct and the contents ready to be edited if
desired. HTML ones converted to HTML and TEXT ones unmodified.
2019-05-19 10:42:59 +02:00
Eloy Lafuente (stronk7)
743d66bfbd MDL-65635 forum: Small improvement to the advanced button
1) Always honor the preferred format (this is a new post).
2) Only perform the conversion to HTML when the preferred format is
HTML.

This way, users having HTML as format (because of their editor
preference) will get the inline-reply converted to HTML and the
editor displayed.

And users not having HTML as format (because of their edito preference)
will get the format set to their format (PLAIN, MOODLE or MARKDOWN) with the
contents unmodified. Of course, if anybody is using a PLAIN, MOODLE or
MARKDOWN editor... it will be displayed.
2019-05-19 10:42:59 +02:00
Sara Arjona
f6548dfbae MDL-65635 forum: convert inline reply format when opening the advanced
When a inline reply post is written and the user changes to the
advanced edition, the post format has to be converted from FORMAT_MOODLE.
2019-05-19 10:42:59 +02:00
Sara Arjona
88f6ca6cbe MDL-65635 forum: Add messageformat and tohtml params to inline-reply
The messageformat and tohtml params have been added to the addDiscussionPost
method to send the original format the contents are written and to force
to convert them from "messageformat" to HTML.
2019-05-19 10:42:59 +02:00
Eloy Lafuente (stronk7)
f2eb04c170 MDL-65635 forum: add_discussion_post() format support changes
While keeping BC as possible (format will be saved as FORMAT_HTML
as default and content not modified), this commit includes these
changes:

- A new parameter 'messageformat', defaults to FORMAT_HTML.
- A new option 'tohtml', enabling the function to convert content
  in other formats to FORMAT_HTML before saving them.
2019-05-19 10:42:59 +02:00
Eloy Lafuente (stronk7)
429649efbf Merge branch 'MDL-65641' of git://github.com/stronk7/moodle 2019-05-19 10:23:36 +02:00
Eloy Lafuente (stronk7)
b6c3b130c4 MDL-65641 forum: Make forum post form to honor existing MOODLE_FORMAT
Since the night of the times (MDL-16698) we have been performing
that simple empty($post->messageformat) check to decide if the
preferred editor format should be used, instead of any existing format.

Problem is that FORMAT_MOODLE == 0, so the condition evaluates
to to true and then the preferred editor takes the baton when it should
not. Exiting format must win always!

So this just makes the condition a little better, checking if the
attribute is set and that it's numerical (accepting both n and 'n').

That covers the FORMAT_MOODLE case and any other valid format. Only if the
conditions aren't met the preferred editor format takes the baton. Only
then.
2019-05-18 11:02:29 +02:00
AMOS bot
fa53cd8b98 Automatically generated installer lang files 2019-05-18 00:12:30 +00:00
David Monllaó
a9db4f903d MDL-65067 tool_analytics: Limit update_end_date to format_weeks 2019-05-17 16:57:46 +02:00
Didier 'OdyX' Raboud
62e1b79cb0 MDL-65067 analytics: Strengthen format_weeks detection
The public function get_section_dates($section, $startdate = false) is
only defined in format_weeks, not in format_base.

As other formats can (and format_topcoll has) declare a different
get_section_dates public method, merely checking that it exists is not
sufficient to guarantee that it can be called with just a section object.

Check that the format either is, or is a subclass of format_weeks.
2019-05-17 13:24:47 +02:00
AMOS bot
136d8c97de Automatically generated installer lang files 2019-05-17 00:14:21 +00:00
Eloy Lafuente (stronk7)
49f2581ef8 Moodle release 3.7rc2 v3.7.0-rc2 2019-05-16 10:57:08 +02:00
Jake Dallimore
d08358b866 Merge branch 'MDL-65619-master' of git://github.com/aanabit/moodle 2019-05-16 15:14:27 +08:00
Jun Pataleta
1cc57c5d10 Merge branch 'MDL-65608-master' of https://github.com/ryanwyllie/moodle 2019-05-16 15:05:47 +08:00
Adrian Greeve
d15589bc08 Merge branch 'MDL-65601_master' of git://github.com/dmonllao/moodle 2019-05-16 13:25:44 +08:00
Jun Pataleta
44e148df79 Merge branch 'MDL-65607-master' of git://github.com/mihailges/moodle 2019-05-16 12:56:51 +08:00
Mihail Geshoski
b84f79ec80 MDL-65607 forum: Add prefix to forum global functions 2019-05-16 11:49:37 +08:00
Jun Pataleta
c92a33a5ec Merge branch 'MDL-65603-master' of git://github.com/peterRd/moodle 2019-05-16 11:01:57 +08:00
Jun Pataleta
7383512e04 Merge branch 'MDL-65610-master' of git://github.com/damyon/moodle 2019-05-16 10:35:59 +08:00
Ryan Wyllie
f9d986fa2a MDL-65608 forum: check if group exists in discussion exporter 2019-05-16 09:50:38 +08:00
Eloy Lafuente (stronk7)
838dd0b2a6 Merge branch 'MDL-65566-master-jake' of https://github.com/snake/moodle 2019-05-15 19:48:15 +02:00
Amaia Anabitarte
92717f89a5 MDL-65619 core_message: Don't unset default notification preferences
Default notification preferences are not kept when a notification provider is disabled.
2019-05-15 18:40:13 +02:00
Sara Arjona
a5cdecee34 Merge branch 'MDL-65596-master' of git://github.com/bmbrands/moodle 2019-05-15 14:19:45 +02:00