Commit graph

3829 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
fec2e6c661 Merge branch 'MDL-69855-311' of git://github.com/junpataleta/moodle into MOODLE_311_STABLE 2021-09-09 12:59:45 +02:00
Eloy Lafuente (stronk7)
7c9fe59856 Merge branch 'MDL-67610-311-2' of git://github.com/junpataleta/moodle into MOODLE_311_STABLE 2021-09-07 19:25:26 +02:00
Jun Pataleta
7b3b935a2e MDL-67610 mod_forum: Do not include private replies in unread count
Fetching the counts of unread posts should only include unread regular
posts or unread private reply posts directed to the user unless the user
has the capability to read private replies.
In order to retrieve the correct counts, we also need to loop through
each forum instance in the course to check the capability of the user to
read private replies in each forum.
2021-09-07 23:20:23 +08:00
David Mudrák
d6bc2e2a47 MDL-72428 lang: Use the fixed strings in the tests 2021-09-01 21:55:41 +02:00
Helen Foster
a8bae35491 MDL-72428 lang: Import fixed English strings (en_fix) 2021-09-01 21:53:31 +02:00
Sara Arjona
2993eadf2d Merge branch 'MDL-71029-311' of https://github.com/dcai/moodle into MOODLE_311_STABLE 2021-08-26 07:12:27 +02:00
Tomo Tsuyuki
b1ab339ee0 MDL-70176 mod_forum: Grading respects separate groups filter 2021-08-20 13:35:28 +10:00
Jun Pataleta
9b0616be13 MDL-69855 mod_forum: Don't show reply link in email for private replies 2021-08-16 17:46:00 +08:00
Andrew Nicols
3dd5ef4cc0 MDL-72179 behat: Make use of page resolvers 2021-07-26 15:14:24 +08:00
Eloy Lafuente (stronk7)
fa012b1b3c MDL-70335 behat: Ensure the scenario passes under all themes
Also, get rid of not needed @javascript tag
2021-07-08 23:32:19 +02:00
Eloy Lafuente (stronk7)
bf5e9b7aec Merge branch 'MDL-70335-311' of https://github.com/juancs/moodle into MOODLE_311_STABLE 2021-07-06 20:18:33 +02:00
Juan Segarra Montesinos
b7b5d7112f MDL-70335 mod_forum: Subscribe users from Forced to Auto mode
When a teacher changes the subscription mode from forced
subscription to auto subscription using the "cog" icon in the
forum page, users are not seen in the Show/edit current
subscribers" page.

This does not happens when done from the Edit settings page.
2021-07-03 09:51:28 +02:00
Helen Foster
b6dca70a44 MDL-72063 lang: Import fixed English strings (en_fix) 2021-07-01 19:14:53 +02:00
Dongsheng Cai
9a50919cbc MDL-71029 forum: fix post count for users have more than 1 enrolment 2021-06-23 09:44:05 +10:00
Andrew Nicols
613cd69cbd MDL-71113 javascript: Improve basic JS Documentation 2021-06-18 09:38:05 +08:00
Andrew Nicols
e214af5720 MDL-71113 js: Fix all jsdoc warnings 2021-06-18 09:38:05 +08:00
Andrew Nicols
43ae52cbf8 MDL-71113 js: Bare minimum fixes to build jsdoc 2021-06-18 09:38:04 +08:00
Eloy Lafuente (stronk7)
b23a50a063 MDL-71638 upgrade: add 3.10.0 separation line to all upgrade scripts 2021-05-16 00:00:43 +02:00
Eloy Lafuente (stronk7)
0524a0b9f9 MDL-71583 versions: Add all the missing full-stops to version/requires
It seems that the new phpcs3 checker is now controlling those
line comments that previously were ignored.

This commit just looks for all the cases and bulk-add
them when needed. The bash script (mac) used to add all them is:

while read -r line; do
    arr=(${line//:/ })
    if [[ -n ${arr[0]} ]] && [[ -n ${arr[1]} ]]; then
        echo "  file ${arr[0]}, line ${arr[1]}"
        sed -i "${arr[1]}s/\$/\./" ${arr[0]}
    fi
done < <(find . -name version.php | xargs ag --nomultiline '>(version|requires) *=.*//.*[^;\.]$')
2021-05-11 20:00:11 +02:00
Eloy Lafuente (stronk7)
71d0cfefab MDL-71583 versions: bump all versions and requires near release
version = 2021051700 release version
requires= 2021051100 current rc1 (week7roll1) version

Note that, because we are under parallel development period,
this is being done in the branch that is going to be released
(MOODLE_311_STABLE already existing) for Moodle 3.11.0 and
not in master, that is the one getting the bump under normal
(non-parallel) periods.
2021-05-11 18:50:34 +02:00
Mihail Geshoski
f78e9f3ffe MDL-71570 mod_forum: Avoid using deprecated string in forum templates 2021-05-10 12:22:11 +08:00
Eloy Lafuente (stronk7)
330d34a714 Merge branch 'MDL-70772-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE 2021-05-06 23:20:03 +02:00
Eloy Lafuente (stronk7)
896123d130 Merge branch 'MDL-71425-311-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_311_STABLE 2021-05-04 23:39:40 +02:00
David Mudrák
4806989294 MDL-71425 lang: Fix reworded strings in tests 2021-05-04 17:47:01 +02:00
Paul Holden
49c74619f7 MDL-71359 mod_forum: empty forums shouldn't export anything. 2021-05-04 17:22:21 +02:00
Jun Pataleta
f350b8e0bd Merge branch 'MDL-71401-311-3' of git://github.com/mickhawkins/moodle into MOODLE_311_STABLE 2021-05-04 12:26:41 +08:00
Michael Hawkins
5ba3aa765d MDL-71401 mod_forum: Update completion behat to test individual changes 2021-05-04 12:22:36 +08:00
Sara Arjona
afb9462896 Merge branch 'MDL-71163-311' of git://github.com/rezaies/moodle into MOODLE_311_STABLE 2021-05-03 12:00:06 +02:00
Víctor Déniz
997d9c4468 Merge branch 'MDL-71189-311-3' of git://github.com/mickhawkins/moodle into MOODLE_311_STABLE 2021-05-03 08:17:45 +01:00
Michael Hawkins
70b16bb87c MDL-71189 core_completion: Adding completion sort order to activities
This implements sort ordering for all completion conditions, in
activities which support custom completion conditions.
2021-05-03 13:42:23 +08:00
Ilya Tregubov
be5eff78ab MDL-66431 core: Fix behat tests.
Move activity creation to data generators. Only fixing those
tests failing due to removing usemodchooser preference.
2021-05-01 16:18:56 +02:00
Shamim Rezaie
4b593aaeef MDL-71163 mod_forum: Remove duplicate due date info 2021-04-30 17:15:54 +10:00
Sara Arjona
76cda8ba33 Merge branch 'MDL-71162-311-2' of git://github.com/mickhawkins/moodle into MOODLE_311_STABLE 2021-04-29 17:27:27 +02:00
Jun Pataleta
20f2014d0d Merge branch 'MDL-70863-311' of git://github.com/jleyva/moodle into MOODLE_311_STABLE 2021-04-29 15:04:32 +08:00
Michael Hawkins
751220c3be MDL-71162 mod_forum: Add behat testing for completion conditions 2021-04-29 00:47:21 +08:00
Andrew Nicols
1d7bbdfc08 Merge branch 'MDL-71389-311' of git://github.com/marinaglancy/moodle into MOODLE_311_STABLE 2021-04-28 09:49:48 +08:00
Sara Arjona
6f890af454 Merge branch 'MDL-71144-311' of git://github.com/rezaies/moodle into MOODLE_311_STABLE 2021-04-23 13:16:10 +02:00
abgreeve
bdad52f522 Merge branch 'MDL-70818-311-4' of git://github.com/rezaies/moodle into MOODLE_311_STABLE 2021-04-23 12:18:31 +08:00
Shamim Rezaie
e6a6b08196 MDL-70818 mod_forum: implement activity_dates for the forum module 2021-04-23 13:47:50 +10:00
Shamim Rezaie
3594a90298 MDL-70818 mod_forum: cache forum times in modinfo for performance 2021-04-23 13:47:50 +10:00
Jun Pataleta
81ddb3c13d MDL-71144 mod_forum: Deprecate forum_get_completion_state() 2021-04-22 21:28:09 +10:00
Marina Glancy
6d107d48c9 MDL-71389 various: changes to unittests due to php8 changes:
- some engine error messages changed
- some warning levels changed
- the carriage return symbol randomly appears
- one phpunit assertion fails and not really representative of anything
2021-04-21 12:39:02 +02:00
Bas Brands
37f26f211f MDL-28452 core_user: migrate social profile fields
Create a new profile field type, move all existing content of the fields
'icq', 'skype', 'aim', 'yahoo', 'msn' and 'url' in the mdl_user table to
theses new profile fields if needed.

AMOS BEGIN
MOV [aimid,core],[aimid,courseimage,profilefield_social]
MOV [yahooid,core],[yahooid,profilefield_social]
MOV [skypeid,core],[skypeid,profilefield_social]
MOV [icqnumber,core],[icqnumber,profilefield_social]
MOV [msnid,core],[msnid,profilefield_social]
MOV [webpage,core],[webpage,profilefield_social]
AMOS END
2021-04-21 11:24:34 +02:00
Paul Holden
5a862117fd MDL-70772 mod_forum: check for valid usernode before making active. 2021-04-14 09:20:13 +01:00
Adrian Greeve
6dfbb08b53 Merge branch 'MDL-71161-311-4' of git://github.com/junpataleta/moodle into MOODLE_311_STABLE 2021-04-13 11:41:22 +08:00
Simey Lameze
35bd229134 MDL-71161 mod_forum: show forum activity info 2021-04-13 01:25:30 +08:00
Sara Arjona
e1b7284e33 Merge branch 'MDL-68716-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE 2021-04-12 17:24:40 +02:00
Adrian Greeve
aaf93840d0 Merge branch 'MDL-70821-311-5' of git://github.com/junpataleta/moodle into MOODLE_311_STABLE 2021-04-12 14:44:58 +08:00
Jun Pataleta
0da0a3d344 MDL-70821 behat: Use new activity completion steps for Behat tests
Replace usages of completion Behat steps that check for the completion
checkboxes with the new activity completion Behat steps.
2021-04-12 12:29:23 +08:00
Simey Lameze
0484b4b91a MDL-70820 mod_forum: custom completion implementation 2021-04-07 12:18:16 +08:00