Commit graph

90551 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
a6ff7933a1 Merge branch 'MDL-63798_assign_restore_groups_35' of git://github.com/davosmith/moodle into MOODLE_35_STABLE 2018-11-21 16:09:09 +01:00
Davo Smith
e35c7c2c50 MDL-63798 mod_assign: fix restore when group is missing 2018-11-21 08:02:47 +00:00
David Monllao
d699efb4ba Merge branch 'MDL-64063-35' of git://github.com/abgreeve/moodle into MOODLE_35_STABLE 2018-11-21 06:28:46 +01:00
Adrian Greeve
0073588e27 MDL-64063 core_calendar: Unit test for suspended users. 2018-11-21 09:55:08 +08:00
Adrian Greeve
80cf67eaba MDL-64063 core_calendar: events by time considers enrolment status. 2018-11-21 09:54:58 +08:00
Víctor Déniz Falcón
a23caa49b9 MDL-64077 block_site_main: modify style to fix layout in boost theme 2018-11-21 09:03:31 +08:00
David Monllao
dfecd50ac3 Merge branch 'MDL-63571-35' of git://github.com/peterRd/moodle into MOODLE_35_STABLE 2018-11-20 17:19:47 +01:00
David Monllao
56d8e413ba weekly release 3.5.3+ 2018-11-20 12:55:14 +01:00
David Monllao
3955dde284 Merge branch 'MDL-63394-35' of git://github.com/jleyva/moodle into MOODLE_35_STABLE 2018-11-20 10:34:09 +01:00
Juan Leyva
d55565066c MDL-63394 mod_quiz: Do not fail overdue if there is a grace period 2018-11-20 09:27:40 +01:00
Peter
810bb4bef5 MDL-63571 gradebook: Display the name header based on config setting 2018-11-20 14:16:09 +08:00
Luca Bösch
b6f83c07ed MDL-63571 grades: switch firstname/lastname order in title row 2018-11-20 14:16:09 +08:00
Andrew Nicols
58c02975d1 MDL-64049 core: Cache prefs for current user
We were already caching these preferences when a user object is provided
to get_user_preferences, or when $USER is provided.

This changee swaps get_user_preferences to use the global USER object
when the USER->id matches the userid supplied to the function.
2018-11-20 00:34:58 +01:00
Eloy Lafuente (stronk7)
ef212b671e Merge branch 'MDL-63976-35-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_35_STABLE 2018-11-19 22:09:15 +01:00
Helen Foster
cac9d8d665 MDL-63976 lang: Merge English strings from the en_fix language pack 2018-11-19 19:21:59 +01:00
David Monllao
127c4954a5 Merge branch 'MDL-63627-35' of git://github.com/jleyva/moodle into MOODLE_35_STABLE 2018-11-19 09:46:16 +01:00
Jun Pataleta
af1a540eab Merge branch 'MDL-63994-35-castoken' of git://github.com/mudrd8mz/moodle into MOODLE_35_STABLE 2018-11-19 15:51:27 +08:00
David Monllao
421b7b0c12 Merge branch 'MDL-63487-35' of https://github.com/lucaboesch/moodle into MOODLE_35_STABLE 2018-11-19 08:07:55 +01:00
David Monllao
8b508a6004 Merge branch 'MDL-63768-35' of https://github.com/lucaboesch/moodle into MOODLE_35_STABLE 2018-11-19 06:06:50 +01:00
Jun Pataleta
8bee660d88 Merge branch 'MDL-64001-35' of https://github.com/christianwolters/moodle into MOODLE_35_STABLE 2018-11-19 11:46:41 +08:00
Luca Bösch
54216a57a8 MDL-63768 atto_link: dialog auto width. 2018-11-16 17:27:55 +01:00
Luca Bösch
d078274a59 MDL-63487 badges: Style "◀ Award badge" and "Revoke badge ▶" buttons 2018-11-16 17:27:44 +01:00
Juan Leyva
5fdb6183e5 MDL-63627 enrol: Return progress field correctly
- Check permissions and
- Return the progress for the given user
2018-11-16 15:58:07 +01:00
Eloy Lafuente (stronk7)
fc2cde8f80 weekly release 3.5.3+ 2018-11-16 12:03:10 +01:00
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