100619 Commits

Author SHA1 Message Date
AMOS bot
11919a5bf5 Automatically generated installer lang files 2021-04-09 00:07:57 +00:00
Víctor Déniz
f85364c1ea Merge branch 'MDL-70769-master' of https://github.com/sharidas/moodle 2021-04-09 00:54:18 +01:00
Eloy Lafuente (stronk7)
c06ed30430 Merge branch 'MDL-70802-master' of git://github.com/andrewnicols/moodle 2021-04-08 18:30:13 +02:00
Sara Arjona
fc59c4773e Merge branch 'MDL-65616' of git://github.com/paulholden/moodle 2021-04-08 17:45:41 +02:00
Eloy Lafuente (stronk7)
c33b5efaad Merge branch 'master_MDL-32226' of https://github.com/danmarsden/moodle 2021-04-08 17:30:12 +02:00
Víctor Déniz
25b8cb9783 Merge branch 'MDL-71116-master' of git://github.com/sarjona/moodle 2021-04-08 01:01:15 +01:00
Víctor Déniz
6bd0e7b34d Merge branch 'MDL-71178-master' of git://github.com/junpataleta/moodle 2021-04-07 16:09:15 +01:00
Amaia Anabitarte
33fed53ad9 MDL-71107 core_contentbank: Behat test. Authoring when copying a course 2021-04-07 10:03:38 +02:00
Amaia Anabitarte
9b7b70ca9b 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
1145cf4659 Merge branch 'MDL-70935-master-4' of git://github.com/mickhawkins/moodle 2021-04-07 15:41:04 +08:00
Shamim Rezaie
a75861f78e MDL-70935 mod_quiz: Custom completion implementation 2021-04-07 15:09:36 +08:00
Shamim Rezaie
7a9f13e37f 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:09:36 +08:00
Shamim Rezaie
24b9ff4c71 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:09:36 +08:00
Michael Hawkins
663b273a55 MDL-70935 mod_scorm: Custom completion implementation 2021-04-07 15:09:36 +08:00
Michael Hawkins
f85b36edc5 MDL-70935 mod_lesson: Custom completion implementation 2021-04-07 15:09:36 +08:00
Adrian Greeve
7ef3653b65 Merge branch 'MDL-70820-master' of git://github.com/lameze/moodle 2021-04-07 13:26:12 +08:00
Simey Lameze
7c7c1aafc8 MDL-70820 mod_forum: custom completion implementation 2021-04-07 12:17:30 +08:00
Simey Lameze
d8e2ca0aae MDL-70820 mod_glossary: custom completion implementation 2021-04-07 12:17:30 +08:00
Simey Lameze
c8cb54f15a MDL-70820 mod_assign: custom completion implementation 2021-04-07 12:17:30 +08:00
Simey Lameze
f807863ba3 MDL-70820 mod_data: custom completion implementation 2021-04-07 12:17:30 +08:00
Simey Lameze
5e26acf0b0 MDL-70820 mod_feedback: custom completion implementation 2021-04-07 12:17:30 +08:00
Simey Lameze
20e5a04776 MDL-70820 mod_survey: custom completion implementation 2021-04-07 12:17:30 +08:00
Eloy Lafuente (stronk7)
68a6915c06 Merge branch 'MDL-68635' of https://github.com/paulholden/moodle 2021-04-06 22:23:15 +02:00
Víctor Déniz
f72cc98503 Merge branch 'MDL-71128' of git://github.com/paulholden/moodle 2021-04-06 19:41:04 +01:00
Eloy Lafuente (stronk7)
aa8c07276b 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:46 +02:00
Eloy Lafuente (stronk7)
068430e3ce 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:46 +02:00
Sara Arjona
18aafd0ed4 weekly release 4.0dev 2021-04-06 15:29:06 +02:00
Sara Arjona
28d90a0be6 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2021-04-06 15:29:02 +02:00
Eloy Lafuente (stronk7)
0384e9d254 Merge branch 'MDL-71215-master' of https://github.com/sammarshallou/moodle 2021-04-06 15:13:16 +02:00
sam marshall
af3c05ca44 MDL-71215 Acceptance test: Missing Behat for webservice service_users 2021-04-06 11:52:56 +01:00
Adrian Greeve
9a58a5f7e6 Merge branch 'MDL-70817-master' of git://github.com/abgreeve/moodle 2021-04-06 16:35:17 +08:00
Adrian Greeve
03e0523e22 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:42:27 +08:00
Michael Hawkins
a3e2e2d669 MDL-70595 core: Updated security.txt expiry 2021-04-06 13:01:19 +08:00
Adrian Greeve
b816b9566d Merge branch 'MDL-70817-master-8' of git://github.com/junpataleta/moodle 2021-04-06 13:00:53 +08:00
Peter Dias
c8c39e403b MDL-70207 core_navigation: Primary nav unit tests 2021-04-06 11:45:44 +08:00
Peter Dias
f8f83eae0e MDL-70207 core_navigation: Initial backend for primary navigation 2021-04-06 11:45:44 +08:00
AMOS bot
2f61120648 Automatically generated installer lang files 2021-04-06 00:08:07 +00:00
Eloy Lafuente (stronk7)
13e89a1e87 Merge branch 'MDL-71215-master' of https://github.com/sammarshallou/moodle 2021-04-04 15:49:59 +02:00
AMOS bot
9e64a9ac2b Automatically generated installer lang files 2021-04-04 00:08:05 +00:00
Jun Pataleta
9a6958ae4c 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:53:20 +08:00
Simey Lameze
ec270a3fef MDL-70781 completion: behat coverage for new setting
Part of MDL-70817
2021-04-02 21:53:20 +08:00
Simey Lameze
a4f7c1d91f MDL-70781 course: setting for displaying completion conditions
Part of MDL-70817
2021-04-02 21:53:20 +08:00
Simey Lameze
c0d0679c8a MDL-70782 course: behat coverage for new setting
Part of MDL-70817
2021-04-02 21:53:20 +08:00
Simey Lameze
680018c95d MDL-70782 course: add setting to show activity dates
Part of MDL-70817
2021-04-02 21:53:20 +08:00
Jun Pataleta
98f44ac00d MDL-70817 mod_choice: Behat tests for the activity completion info 2021-04-02 21:53:20 +08:00
Jun Pataleta
469f035a4c MDL-70817 mod_choice: Show choice activity info 2021-04-02 21:53:20 +08:00
Jun Pataleta
dd32d65f3a 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:53:20 +08:00
Jun Pataleta
3c5b29e75d 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:53:20 +08:00
Jun Pataleta
3a960c15a4 MDL-70817 core_course: Convert core_course/repository to ES6 2021-04-02 21:53:20 +08:00
Jun Pataleta
6fc9b23d3d MDL-70817 core: Allow the manual completion update WS function for AJAX
Allow the core_completion_update_activity_completion_status_manually
web service function to be called from AJAX as well. This is needed
by the new manual completion toggle button in the
core_course/completion_manual template.
2021-04-02 21:53:20 +08:00