28184 Commits

Author SHA1 Message Date
Jun Pataleta
5a7c629f7c Merge branch 'MDL-45242-master' of https://github.com/sammarshallou/moodle 2021-03-10 23:39:30 +08:00
sam marshall
987e55452f MDL-45242 Course: Enrol feature supports custom profile fields 2021-03-10 10:57:11 +00:00
sam marshall
dbc09f74e9 MDL-45242 Admin: User list supports custom profile fields 2021-03-10 10:57:11 +00:00
sam marshall
558cc1b85e MDL-45242 Lib: Replace calls to deprecated functions
In all cases changes have been kept to a minimum while not making
the code completely horrible. For example, there are many instances
where it would probably be better to rewrite a query entirely, but
I have not done that (in order to reduce the risk of changes).
2021-03-10 10:57:10 +00:00
Jun Pataleta
644f32784d Merge branch 'MDL-70911-master' of git://github.com/sarjona/moodle 2021-03-10 16:15:43 +08:00
Sara Arjona
49c1d41a60 MDL-70911 core_badges: Remove $CFG->badges_site_backpack
The $CFG->badges_site_backpack setting has been completely removed
because it's not required anymore. From now, the primary site
backpack will be the first one in the "Manage backpacks" list (so,
the one with lower sortorder value).
2021-03-10 09:09:05 +01:00
Sara Arjona
066e998400 MDL-70911 core_badges: Add support to backpacks sortorder
Before removing $CFG->badges_site_backpack setting, admins should be
able to re-order the existing site-backpacks (because then, the first
one will be treated as the default one).
This patch adds the sort order feature to the backpack list.
2021-03-10 08:29:47 +01:00
Sara Arjona
489318e327 Merge branch 'MDL-70815-master-6' of git://github.com/junpataleta/moodle 2021-03-09 15:18:28 +01:00
Jun Pataleta
8d29653fbc MDL-70815 completion: Test internal_get_state() with custom completion
Use the custom completion implementation for mod_choice to test
completion_info::get_state() to cover the case where the completion
state is being determined from the custom completion condition.
2021-03-09 20:15:28 +08:00
Jun Pataleta
32721b3511 MDL-70815 core_completion: Update completion_info
* Update completion_info::get_data() to add other completion
information from a new method called get_other_cm_completion_data().
This allows the storage of the completion statuses of the following
completion rules to completion_info objects:
  - 'Students must receive a grade' completion rule.
  - Any custom completion rule defined by an activity.
This allows detailed completion information to be fetched for course
modules.
It also allows custom completion statuses to be cached which will help
reduce DB queries when fetching completion statuses.
* Update update_state() to fetch overall completion state from the
module's activity_custom_completion implementation. Falls back to the
*_get_completion_state() callback function.
* Update internal_set_data() to include the other cm completion data
in the updated cache data for the module instance.
2021-03-09 20:15:28 +08:00
Jun Pataleta
18ef213da5 MDL-70815 core_completion: completion_info::get_grade_completion()
Move the current logic for determining the completion status for the
"Student must receive grade" completion rule to a function so it cann
be reused.
Unit test included.
2021-03-09 20:15:28 +08:00
Jun Pataleta
236033151d MDL-70815 core_completion: Fix unit tests
* Unit tests for completion_info::get_data() and
completion_info::internal_get_state are mocked which causes failures
with the new implementation. It's more straightforward and realistic
to generate real course and modules to test these methods.
2021-03-09 20:15:24 +08:00
Jun Pataleta
beb0dd74f2 MDL-70815 core_completion: Activity custom completion details base class
* Base class for defining an activity module's custom completion details
2021-03-09 19:27:41 +08:00
Sara Arjona
323b3ca3a4 Merge branch 'MDL-70766-auth-config-log' of https://github.com/brendanheywood/moodle 2021-03-08 11:39:13 +01:00
sam marshall
3f003455f3 MDL-45242 Lib: Replace direct references to ->showuseridentity 2021-03-08 09:20:18 +00:00
sam marshall
60a1b159aa MDL-45242 Lib: Deprecate field-related library functions 2021-03-08 09:20:18 +00:00
sam marshall
677e1c6248 MDL-45242 Lib: Allow custom profile fields in showuseridentity 2021-03-08 09:20:18 +00:00
sam marshall
9ddb51b07e MDL-45242 Testing: Generators for user profile fields 2021-03-08 09:20:17 +00:00
sam marshall
e18b37c61d MDL-45242 Admin: Added lazy-loading callback to multicheckbox
Currently admin_setting_configselect has lazy-loading support via a
callback function (so you don't have to make pointless single-use
classes for each unusual setting), but this is not present in other
similar types.

This commit adds identical support to
admin_setting_configmulticheckbox.
2021-03-08 09:20:17 +00:00
Ilya Tregubov
eaf40e050e MDL-69680 lib: Replace deprecated jQuery functions 2021-03-04 12:48:26 +08:00
Ilya Tregubov
ec47946ea9 MDL-69680 lib: Update jQuery version in Moodle files 2021-03-04 12:48:26 +08:00
Ilya Tregubov
d00e53dd31 MDL-69680 lib: Upgrade jQuery lib to 3.5.1 2021-03-04 12:48:26 +08:00
Eloy Lafuente (stronk7)
8cf7878e18 Merge branch 'MDL-70424-auth-avoid-changes' of https://github.com/brendanheywood/moodle 2021-03-04 00:27:53 +01:00
Marina Glancy
9cfacff738 MDL-65552 user: escape idnumber and email in table_sql 2021-03-03 23:15:07 +08:00
Paul Holden
a7e0ba1e71 MDL-65552 user: escape idnumber field on output.
This commit also corrects parameter definition of the field to
match core_user.
2021-03-03 23:15:07 +08:00
Sara Arjona
01959703ba Merge branch 'MDL-70125_master-3' of git://github.com/mdjnelson/moodle 2021-03-03 15:47:16 +01:00
Sara Arjona
9d58d4de46 Merge branch 'MDL-67494-master' of git://github.com/lameze/moodle 2021-03-03 11:45:28 +01:00
Sara Arjona
535c0277de Merge branch 'MDL-67119-master' of git://github.com/aanabit/moodle 2021-03-03 11:11:29 +01:00
Jun Pataleta
572ec82454 Merge branch 'MDL-70987-master' of git://github.com/andrewnicols/moodle 2021-03-03 16:42:18 +08:00
Sara Arjona
187801ccf5 Merge branch 'MDL-70966-master' of git://github.com/marinaglancy/moodle 2021-03-03 09:30:41 +01:00
Simey Lameze
633a822f88 MDL-67494 calendar: user_delete_user should delete all user events 2021-03-03 16:06:32 +08:00
Simey Lameze
2dd31504b9 MDL-67494 calendar: set userid to zero for shared events 2021-03-03 16:06:32 +08:00
Simey Lameze
ba04a79ac6 MDL-67494 calendar: step to set userid 0 to all shared events 2021-03-03 16:06:32 +08:00
Andrew Nicols
3cda34adf2 Merge branch 'MDL-70268-master-2' of git://github.com/peterRd/moodle 2021-03-03 12:23:04 +08:00
Peter Dias
63cb8999ce MDL-70268 core: Update the oauthlib to exclude scope if none provided 2021-03-03 12:03:40 +08:00
Sander Wind
c9855a8b20 MDL-70668 auth: Fix secret validation during user confirmation
Co-authored-by: Michael Hawkins <michaelh@moodle.com>
2021-03-02 23:44:24 +01:00
Jun Pataleta
e86504fbcf Merge branch 'MDL-70457' of https://github.com/stronk7/moodle 2021-03-02 17:39:36 +08:00
Víctor Déniz
b1bbfbbbdb Merge branch 'MDL-70172-master' of git://github.com/rezaies/moodle 2021-03-02 09:16:41 +00:00
Sara Arjona
b64ee9ecf3 Merge branch 'MDL-70877' of https://github.com/stronk7/moodle 2021-03-02 09:29:17 +01:00
Jun Pataleta
2b113fd93c Merge branch 'MDL-70876' of https://github.com/stronk7/moodle 2021-03-02 16:02:52 +08:00
Eloy Lafuente (stronk7)
ece2fe5da1 Merge branch 'MDL-70899-master' of git://github.com/marinaglancy/moodle 2021-03-01 20:20:46 +01:00
Shamim Rezaie
612a1741f6 MDL-70172 output: pages with main logo should have a first-level header 2021-03-02 05:35:14 +11:00
Sara Arjona
f5bee1b704 Merge branch 'MDL-68735' of https://github.com/stronk7/moodle 2021-03-01 16:17:19 +01:00
Eloy Lafuente (stronk7)
76e5b1b59d Merge branch 'MDL-70913-master' of git://github.com/sarjona/moodle 2021-03-01 14:21:59 +01:00
Sara Arjona
9e5655b7c7 MDL-70913 core_badges: Use and update properly sortorder
Sortorder field in badge_external_backpack was updated with a wrong
value. This patch fixes this behaviour and adds sortorder as
sorting criteria for displaying the list of site backpacks.

In the phpunit method reviewed for covering this, a couple of
assertEquals() calls have been changed too to put the expected value
first.
2021-03-01 13:04:00 +01:00
Eloy Lafuente (stronk7)
b7d3e56d7e Merge branch 'MDL-70931-master-xmldbeol' of git://github.com/mudrd8mz/moodle 2021-03-01 10:00:27 +01:00
Eloy Lafuente (stronk7)
ac9b920981 Merge branch 'MDL-70964-master-enfix' of git://github.com/mudrd8mz/moodle 2021-03-01 09:33:49 +01:00
Marina Glancy
612c230709 MDL-70966 various: Under PHP8 empty string is no longer equals to 0 2021-02-28 19:16:09 +01:00
Eloy Lafuente (stronk7)
08ae245926 MDL-70876 php80: 5th param removed from custom error handlers
It was deprecated in php72 and now it's gone.

Have used this regexp to find all the uses in core:

ag set_error_handler | uniq

And then checked all them manually, that parameter was not
being used in the 3 methods where we are removing it.
2021-02-26 13:08:27 +01:00
Eloy Lafuente (stronk7)
0dea9a80c8 MDL-68735 env: Moodle 3.8.x, 3.9.x and 3.10.x do not support PHP 8.0 2021-02-26 13:07:59 +01:00