moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
90678 commits 37 branches 544 tags 1.3 GiB
Commit graph

90678 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jun Pataleta
28ca1302e5 Merge branch 'MDL-63999-35' of git://github.com/lameze/moodle into MOODLE_35_STABLE 2018-11-16 14:36:07 +08:00
Simey Lameze
5809488bb6 MDL-63999 calendar: double escape event name on templates 2018-11-16 13:59:29 +08:00
Jun Pataleta
4e0886f362 Merge branch 'MDL-63660-35' of git://github.com/junpataleta/moodle into MOODLE_35_STABLE 2018-11-16 10:52:58 +08:00
Jun Pataleta
96388117d4 MDL-63660 tool_dataprivacy: Increase expected export file size 2018-11-16 10:49:10 +08:00
Mark Johnson
c2650d3f3d MDL-63660 privacy: Include CSS locally for data export 2018-11-16 10:49:10 +08:00
Damyon Wiese
e7fd2113c0 Merge branch 'wip-MDL-63854-MOODLE_35_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_35_STABLE 2018-11-16 10:45:05 +08:00
Eloy Lafuente (stronk7)
32878692e3 Merge branch 'MDL-64012_35' of https://github.com/timhunt/moodle into MOODLE_35_STABLE 2018-11-16 01:03:45 +01:00
Kevin Wiliarty
696ecda501 MDL-63854 competencies, themes: misplaced dropdown arrows 2018-11-15 15:52:45 -05:00
David Mudrák
31bfc01e9d MDL-63994 auth_cas: Include the login token in the simulated login form 
The CAS login process relies on the standard authenticate_user_login()
call to set up the user. So we need to inject the login token to pass
the validation.
 2018-11-15 20:44:03 +01:00
David Mudrák
f779e204ac MDL-63994 login: Improve the logintoken param input 
The logintoken is supposed to arrive as a part of the login form ($frm)
together with the username and password. So it should be handled the
same way - including the opportunity for the auth plugins to provide the
form data via the loginpage_hook().

This also implies that only logintoken coming as a part of the POST
request are taken into account, which is a good thing and another thin
layer in this security mechanism.
 2018-11-15 20:35:46 +01:00
David Mudrák
9ccfa64940 MDL-63994 login: Clarify inline comments on loginpage_hook() usage 
While working on the issue, I found these inline comments outdated and
confusing. The auth plugin types can implement a loginpage_hook()
method, the purpose of which is to inject the $user and/or $frm into
this login/index.php script. The new comments should make it more clear.

Note the second comment mentioned a prelogin_hook() which was an old
name of what is now called loginpage_hook(). It had nothing to do with
the existing pre_loginpage_hook() and was only confusing.
 2018-11-15 20:27:58 +01:00
Jun Pataleta
2ca939b838 Merge branch 'MDL-63832-35' of git://github.com/jleyva/moodle into MOODLE_35_STABLE 2018-11-15 23:11:55 +08:00
Christian Wolters
d04454fed5 MDL-64001 boost: Dropdown menu adding missing href 2018-11-15 12:39:09 +01:00
Jun Pataleta
315ffed9fb Merge branch 'MDL-62287-35' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE 2018-11-15 17:10:43 +08:00
Tim Hunt
9933be5fad MDL-64012 filters: activity name autolinking fails for names with () 2018-11-14 16:07:48 +00:00
Juan Leyva
1978e7205d MDL-63832 assign: Check current user can view submission 2018-11-14 16:54:17 +01:00
Eloy Lafuente (stronk7)
307ee3442b Merge branch 'MDL-63653-35' of https://github.com/lucaboesch/moodle into MOODLE_35_STABLE 2018-11-14 16:30:25 +01:00
Eloy Lafuente (stronk7)
42add6e9ef Merge branch 'MDL-63842-35' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE 2018-11-14 16:12:01 +01:00
David Monllao
6e493f59b8 Merge branch 'MDL-61990_35' of https://github.com/timhunt/moodle into MOODLE_35_STABLE 2018-11-14 12:09:59 +01:00
Damyon Wiese
512547df7e Merge branch 'MDL-64005-35' of git://github.com/abgreeve/moodle into MOODLE_35_STABLE 2018-11-14 16:00:34 +08:00
Andrew Nicols
971d02f6f4 MDL-62287 tool_usertours: Pull v0.12.3 for background click fix 2018-11-14 14:14:17 +08:00
Adrian Greeve
841a0bc6e2 MDL-64005 gradebook: Fix to remove debugging message. 
The progress bar is being used when there are a large amount
of grades being recalculated. This was throwing a debugging message
about NO_OUTPUT_BUFFERING being unset.
 2018-11-14 12:42:30 +08:00
Damyon Wiese
17439b2c46 Merge branch 'MDL-63868-35' of git://github.com/abgreeve/moodle into MOODLE_35_STABLE 2018-11-14 12:08:26 +08:00
Luca Bösch
b675d6c5ee MDL-63653 tool_xmldb: style form elements 2018-11-13 18:14:16 +01:00
Tim Hunt
edfc17d7ba MDL-61990 outputrequirementslib: improve debug message 2018-11-13 17:13:09 +00:00
David Monllao
ab16666f05 Merge branch 'MDL-63882-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE 2018-11-13 16:07:27 +01:00
David Monllao
628a7bb557 weekly release 3.5.3+ 2018-11-13 13:10:48 +01:00
David Monllao
058db3e6c8 Merge branch 'install_35_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_35_STABLE 2018-11-13 13:10:46 +01:00
Adrian Greeve
ca2f0f052c MDL-63868 core_calendar: Clicking link leads to events. 
The mini calendar did not link to the daily events properly.
 2018-11-13 15:36:17 +08:00
Damyon Wiese
7ef3dbf5f4 Merge branch 'MDL-63927_35' of git://github.com/stronk7/moodle into MOODLE_35_STABLE 2018-11-13 11:57:55 +08:00
Damyon Wiese
f0e03e6918 MDL-63882 core_message: Use validate_parameters 
external_api::validate_parameters() sets defaults, and does cleaning and sanitisation of the
inputs. It returns the cleaned params. We can't be re-using the arguments to this function
instead of the results, because they have not been cleaned.
 2018-11-13 11:02:40 +08:00
AMOS bot
bb56746b61 Automatically generated installer lang files 2018-11-13 00:07:39 +00:00
Andrew Nicols
11a19454d7 Merge branch 'm35_MDL-63953' of https://github.com/danmarsden/moodle into MOODLE_35_STABLE 2018-11-13 07:54:18 +08:00
Eloy Lafuente (stronk7)
aa4f226f5c Merge branch 'MDL-63907-35' of git://github.com/cescobedo/moodle into MOODLE_35_STABLE 2018-11-12 12:08:41 +01:00
David Monllao
a3c626c7e7 Merge branch 'MDL-63925-35' of git://github.com/mickhawkins/moodle into MOODLE_35_STABLE 2018-11-12 11:57:54 +01:00
David Monllao
8ff8f4e558 Merge branch 'MDL-63940-35-recaptchaurl' of git://github.com/mudrd8mz/moodle into MOODLE_35_STABLE 2018-11-12 10:56:12 +01:00
David Monllao
63510633b4 Merge branch 'MDL-63823-35' of git://github.com/lameze/moodle into MOODLE_35_STABLE 2018-11-12 10:09:46 +01:00
Simey Lameze
82447d7ded MDL-63823 tool_lpimportcsv: supress progress bar debugging 2018-11-12 09:53:49 +08:00
Dan Marsden
6dae57a102 MDL-63953 mod_scorm: Use correct value for first attempt. 2018-11-12 10:06:39 +13:00
Eloy Lafuente (stronk7)
789dcd6975 Moodle release 3.5.3 2018-11-10 20:36:27 +01:00
Eloy Lafuente (stronk7)
b908052850 weekly release 3.5.2+ 2018-11-10 12:53:24 +01:00
Eloy Lafuente (stronk7)
f96287e91b Merge branch 'MDL-63960-35' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE 2018-11-10 10:28:16 +01:00
Andrew Nicols
55df5e4c05 MDL-63960 dataprivacy: Do not perform strict type checks for id 
When inherit is specified in the data registry it is stored as a
string and we cannot perform a strict comparison with it.

We should still compare strict comparison checks against null, or false,
but not for the NOTSET (0) or INHERIT values (-1).
 2018-11-10 15:34:11 +08:00
Eloy Lafuente (stronk7)
68987522ea MDL-63919 tool_dataprivacy: admin & notify fixes 
This includes the following:

1) Replace $ADMIN->id by get_admin()->id. The former doesn't exist.
2) Only change the notify parameter when it has not been specified
   at creation time (null). If specified, observe it.
3) Set the current user in tests to admin, able to create those
   requests.
 2018-11-10 11:00:46 +08:00
Eloy Lafuente (stronk7)
cd496c0307 Merge branch 'MDL-63596-35' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE 2018-11-10 03:51:34 +01:00
Andrew Nicols
977632b715 MDL-63596 backup: Add missing include 2018-11-10 10:49:19 +08:00
Eloy Lafuente (stronk7)
d8231aee5e Merge branch 'MDL-63596-35' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE 2018-11-09 19:32:53 +01:00
Damyon Wiese
d3b5e29e2e MDL-63596 backup: Deal with controller types 
For privacy requests, deal with all 3 controller types.
 2018-11-09 17:56:05 +08:00
Mihail Geshoski
8f7f422709 MDL-63596 core_backup: Add support for removal of context users 
This issue is part of the MDL-62560 Epic.
 2018-11-09 17:56:05 +08:00
Andrew Nicols
4c7f930af8 MDL-62564 tool_dataprivacy: Do not delete deleted user 
This also ensures that we do not call delete_user on an already deleted
user.
 2018-11-09 17:36:10 +08:00