Commit graph

100821 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
c1e84df96f Merge branch 'MDL-70802-311' of git://github.com/andrewnicols/moodle into MOODLE_311_STABLE 2021-04-08 18:34:10 +02:00
Sara Arjona
586814d928 Merge branch 'MDL-65616-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE 2021-04-08 17:46:05 +02:00
Eloy Lafuente (stronk7)
919943b742 Merge branch 'm311_MDL_32226' of https://github.com/danmarsden/moodle into MOODLE_311_STABLE 2021-04-08 17:30:33 +02:00
Víctor Déniz
33aaac019c Merge branch 'MDL-71116-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE 2021-04-08 01:05:06 +01:00
Víctor Déniz
e48f35e850 Merge branch 'MDL-71178-311' of git://github.com/junpataleta/moodle into MOODLE_311_STABLE 2021-04-07 16:09:51 +01:00
Amaia Anabitarte
13d89cdcb5 MDL-71107 core_contentbank: Behat test. Authoring when copying a course 2021-04-07 10:03:38 +02:00
Amaia Anabitarte
78a10f1724 MDL-71107 core_contentbank: Fill content author when copying a course
'usercreated' and 'usermodified' fields can not be always mapped.
We are filling those fields with 'old' users when working on the same
site, or with current user when working on a different instance.
2021-04-07 10:03:38 +02:00
Adrian Greeve
8d638989f1 Merge branch 'MDL-70935-311-4' of git://github.com/mickhawkins/moodle into MOODLE_311_STABLE 2021-04-07 15:40:28 +08:00
Shamim Rezaie
26856f48fa MDL-70935 mod_quiz: Custom completion implementation 2021-04-07 15:12:34 +08:00
Shamim Rezaie
e5ac4fd1d9 MDL-70935 mod_quiz: combine 'pass' and 'attemptsexhausted' rules
Custom rules are combined using the AND operator. However, the
'completionpass' and 'completionattemptsexhausted' rules are exceptions
because they are combined together with OR, and form a single new rule
that then will be combined with the rest of the rules using AND.
This commit combines the mentioned rules into a single rule named
'completionpassorattemptsexhausted'.
2021-04-07 15:12:34 +08:00
Shamim Rezaie
1ef67caf2c MDL-70935 mod_quiz: Missing completionminattempts rule description
The mod_quiz_get_completion_active_rule_descriptions() function was not
returning the description for the 'completionminattempts' rule. Added
that.
2021-04-07 15:12:34 +08:00
Michael Hawkins
d938c0f299 MDL-70935 mod_scorm: Custom completion implementation 2021-04-07 15:12:34 +08:00
Michael Hawkins
7d594cb0d3 MDL-70935 mod_lesson: Custom completion implementation 2021-04-07 15:12:34 +08:00
Adrian Greeve
a0f778a5bf Merge branch 'MDL-70820-311' of git://github.com/lameze/moodle into MOODLE_311_STABLE 2021-04-07 13:25:24 +08:00
Simey Lameze
0484b4b91a MDL-70820 mod_forum: custom completion implementation 2021-04-07 12:18:16 +08:00
Simey Lameze
62c7ce69de MDL-70820 mod_glossary: custom completion implementation 2021-04-07 12:18:16 +08:00
Simey Lameze
58a575c5f2 MDL-70820 mod_assign: custom completion implementation 2021-04-07 12:18:16 +08:00
Simey Lameze
3429235bc6 MDL-70820 mod_data: custom completion implementation 2021-04-07 12:18:16 +08:00
Simey Lameze
716ba1224b MDL-70820 mod_feedback: custom completion implementation 2021-04-07 12:18:16 +08:00
Simey Lameze
8a578bad20 MDL-70820 mod_survey: custom completion implementation 2021-04-07 12:18:16 +08:00
Eloy Lafuente (stronk7)
947512995e Merge branch 'MDL-68635-311' of https://github.com/paulholden/moodle into MOODLE_311_STABLE 2021-04-06 22:23:26 +02:00
Víctor Déniz
033c5fd4ff Merge branch 'MDL-71128-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE 2021-04-06 19:50:54 +01:00
Eloy Lafuente (stronk7)
66dbfadd2d MDL-71264 behat: Change date(time) element update order
This includes 2 change to the order date(time) elements are filled,
each one addressing one type of problem, where current order is
problematic and can lead to unexpected dates.

1) Changing date, when current month only has X days and target
   month has more than X days. Example, being 1 April, change
   the date to 31 May.
     This is solved by changing the order of introduction
     from current D => M => Y to Y => M => D.
2) Changing date, when target month only has X days and current
   month has more that X days. Example, being 31 March, change
   the date to 28 Feb.
     This is solved by always setting the D to 1, before the
     Y => M => D sequence commented @ 1) begins.
2021-04-06 16:25:49 +02:00
Eloy Lafuente (stronk7)
42200cfd95 MDL-71264 behat: New feature covering all day/month/year date changes
Because of the order that dates and datetimes are filled by behat
sometimes there are some intermediate results that are impossible
and then the form (javascript) automatically reacts and fixes the
date, ultimate leading to a different date that the one we wanted
to set with Behat.

This is noticeable when switching between months (with some day
being the last day of the month) and the 2 months have a different
number of days. For example April date => March date (or the opposite).

This test covers all the critical changes (day, month and year),
back and forth. All times are Perth/Australia.
2021-04-06 16:25:49 +02:00
Sara Arjona
89cab88a3a on-demand release 3.11dev+ 2021-04-06 15:30:53 +02:00
Sara Arjona
26e3915793 Merge branch 'install_311_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_311_STABLE 2021-04-06 15:30:51 +02:00
sam marshall
fdcb789242 MDL-71215 Acceptance test: Missing Behat for webservice service_users 2021-04-06 15:18:01 +02:00
Adrian Greeve
e7022adf8f Merge branch 'MDL-70817-311' of git://github.com/abgreeve/moodle into MOODLE_311_STABLE 2021-04-06 16:36:25 +08:00
Adrian Greeve
285011017c MDL-70817 lib: Update the install xml file to use the correct length.
The showactivitydates field had the wrong length of 4. This changes
it to 1.
2021-04-06 15:24:00 +08:00
Michael Hawkins
0adce7c350 MDL-70595 core: Updated security.txt expiry 2021-04-06 13:13:31 +08:00
Adrian Greeve
4025e4d726 Merge branch 'MDL-70817-311-8' of git://github.com/junpataleta/moodle into MOODLE_311_STABLE 2021-04-06 12:55:32 +08:00
AMOS bot
14eb59b52b Automatically generated installer lang files 2021-04-06 00:07:41 +00:00
Paul Holden
c3b4e76768 MDL-70099 enrol: increase accuracy of current enrolments by date.
By rounding the current time it was possible that the most recently
created user enrolments (e.g. self enrolments) were being excluded.

This would manifest itself in a user being enrolled on a course,
but it not appearing under "My courses" navigation or on their own
Dashboard until the rounded time had caught up with the current
time.
2021-04-05 19:32:25 +01:00
Paul Holden
28da12e05c MDL-71003 user: fix alignment of autocomplete participant filters. 2021-04-04 23:21:20 +01:00
Paul Holden
998ac6ac22 MDL-70917 tool_behat: fix profile/replace option comparison.
The `isset` call always returned true for the 'replace' option,
because even if not specified it receives a non-null value. The
`strpos` call now does a strict equality check rather than
greater-than-or-equal (which always returns true).
2021-04-04 23:18:30 +01:00
Paul Holden
969114e23d MDL-70763 core: export preferences for correct user.
Ensure we are using the ID of the given user rather than falling
back to that of the current user during privacy export.
2021-04-04 23:15:34 +01:00
Paul Holden
0747f473fb MDL-70763 quiz_overview: export preferences for correct user. 2021-04-04 23:15:34 +01:00
Paul Holden
95aa0b1802 MDL-70763 gradereport_grader: export preferences for correct user. 2021-04-04 23:15:34 +01:00
Paul Holden
7365786853 MDL-66475 task: fix random timing failures in logger cleanup test. 2021-04-04 23:12:49 +01:00
sam marshall
200d01b08e MDL-71215 core_user: User fields - remaining deprecated functions
This change removes references in code and comments to a few
deprecated functions that were accidentally missed in the larger
change.

The code changes only affect service_users.php. I made it support
custom user profile fields in this query, because it was easy
enough, rather than adding another TODO to fix later.
2021-04-04 15:50:47 +02:00
AMOS bot
3c466df88f Automatically generated installer lang files 2021-04-04 00:07:37 +00:00
Jun Pataleta
25ebbe21f0 MDL-70817 admin: Remove heading for showcompletionconditions
It should be under the "Completion tracking" subheading just like in
the course form.
2021-04-02 21:56:22 +08:00
Simey Lameze
5d1e66df65 MDL-70781 completion: behat coverage for new setting
Part of MDL-70817
2021-04-02 21:56:22 +08:00
Simey Lameze
94a8b91cd3 MDL-70781 course: setting for displaying completion conditions
Part of MDL-70817
2021-04-02 21:56:22 +08:00
Simey Lameze
79622a47c8 MDL-70782 course: behat coverage for new setting
Part of MDL-70817
2021-04-02 21:56:22 +08:00
Simey Lameze
8b47f16926 MDL-70782 course: add setting to show activity dates
Part of MDL-70817
2021-04-02 21:56:22 +08:00
Jun Pataleta
437b0ff331 MDL-70817 mod_choice: Behat tests for the activity completion info 2021-04-02 21:56:22 +08:00
Jun Pataleta
dcba388e03 MDL-70817 mod_choice: Show choice activity info 2021-04-02 21:56:22 +08:00
Jun Pataleta
cafe2f95ee MDL-70817 core_course: Create an activity information output component
The activity information output component displays information about
an activity module that can contain:
1. Activity dates
2. Completion information
   a. A manual completion button; or
   b. A list of automatic completion conditions and their statuses.

This patch also includes a new JS module called
core_course/manual_completion_toggle for toggling the
completion state of activities that support manual completion.
2021-04-02 21:56:22 +08:00
Jun Pataleta
a1b3596cb8 MDL-70817 core_course: Add manual completion toggle to repository
Add the functionality of toggling the completion state of an
activity with manual completion to the core_course/repository
JS module.
2021-04-02 21:56:22 +08:00