93699 Commits

Author SHA1 Message Date
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
Eloy Lafuente (stronk7)
89457b26d1 Moodle release 3.7 v3.7.0 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
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
Jake Dallimore
7918a0ea4c MDL-65566 core_message: let get_self_conversation use lazy init too 2019-05-15 18:46:41 +08:00
Jake Dallimore
510ede5698 MDL-65566 core_message: fix bug allowing duplicate unique conversations
Individual and self conversations may exist once only, so we need to
enforce this in the creation method.
2019-05-15 18:46:39 +08:00
Jake Dallimore
0e0e1b4552 MDL-65566 core_user: remove the conversation creation code from lib.php
These are now lazy created in the messaging APIs, so we don't need
to create them on user creation any more.
2019-05-15 18:42:47 +08:00
Sara Arjona
18e5f9bef8 MDL-65566 core_message: create the self-conversation when needed
Instead of creating all the self-conversations during the upgrading,
some code has been added to the get_conversations and to the
get_conversation_counts to create it whe it doesn't exist.
2019-05-15 18:42:46 +08:00
Sara Arjona
384145b1d1 Merge branch 'MDL-65528-master' of git://github.com/peterRd/moodle 2019-05-15 12:14:46 +02:00
Peter
d7ddc44fbd MDL-65603 mod_forum: Add check for property existence 2019-05-15 16:50:49 +08:00
Jun Pataleta
64d680c271 Merge branch 'MDL-65583_master' of git://github.com/dmonllao/moodle 2019-05-15 15:57:05 +08:00
David Monllaó
589a3f57a0 MDL-65601 analytics: Add missing set_modelid calls 2019-05-15 09:34:35 +02:00
Jun Pataleta
2b8ffcc89f Merge branch 'MDL-65599-master' of git://github.com/damyon/moodle 2019-05-15 15:24:12 +08:00
Jun Pataleta
802f7c483c Merge branch 'MDL-65570-master' of git://github.com/lameze/moodle 2019-05-15 14:58:35 +08:00
Jun Pataleta
38b3b6b264 Merge branch 'MDL-65577-master' of https://github.com/ryanwyllie/moodle 2019-05-15 13:47:26 +08:00
Damyon Wiese
453120e940 MDL-65610 lti: ltiversion field optional
The ltiversion field only exists for some preconfigured tool types.
2019-05-15 13:46:56 +08:00
Ryan Wyllie
f2eb9de442 MDL-65577 forum: move forum focus outline onto post div 2019-05-15 12:30:49 +08:00
Jun Pataleta
2135d33ae6 Merge branch 'MDL-65393-master' of git://github.com/rezaies/moodle 2019-05-15 10:52:57 +08:00
Damyon Wiese
54d09c47ec MDL-65599 competencies: Javascript optional param
The module id is expected to be an integer for this webservice, passing
an empty string will generate an exception.
2019-05-15 10:02:04 +08:00
Peter
56e9b6d67d MDL-65603 mod_forum: Recall inline private reply 2019-05-15 09:50:46 +08:00
Simey Lameze
c970e181c7 MDL-65570 qtype_multianswer: use unique id function 2019-05-15 09:05:37 +08:00
Shamim Rezaie
abbf6e5499 MDL-65393 core: Peer review amendments
- defining and using constand properties instead of hard-coded values
- Fixing the docblock for the cleanup_recent_session_locks function
2019-05-15 02:30:48 +10:00
Ilya Tregubov
dbed8bdb86 MDL-65393 core: Make session history cleanup more aggressive. 2019-05-15 02:22:23 +10:00
Bas Brands
c516fc1105 MDL-65596 core_message: dropdown menu blocked by contact request message 2019-05-14 13:17:40 +02:00
Sara Arjona
b742fe1403 Moodle release 3.7rc1 v3.7.0-rc1 2019-05-14 12:11:25 +02:00
Jun Pataleta
65c9f44c68 Merge branch 'MDL-65569-master' of git://github.com/andrewnicols/moodle 2019-05-14 12:53:50 +08:00
Peter
76cf4db73e MDL-65528 mod_forum: Do not render add discussion if not permitted 2019-05-14 12:47:32 +08:00
Andrew Nicols
50b52ef4b2 MDL-65569 mod_forum: Correct rules for SSD
In a Single Simple Discussion forum, the first post can only be edited
by a user with the manageactivities capability, but all other posts
behave as normal.
2019-05-14 12:32:05 +08:00
Andrew Nicols
e31f357e64 Merge branch 'MDL-65574-master' of https://github.com/ryanwyllie/moodle 2019-05-14 12:17:25 +08:00