Commit graph

23922 commits

Author SHA1 Message Date
Dan Poltawski
e3a2d7a473 Merge branch 'MDL-59366-master' of git://github.com/junpataleta/moodle 2017-08-01 10:36:14 +01:00
Dan Poltawski
b8cf4be7a7 Merge branch 'MDL-59658-master' of git://github.com/junpataleta/moodle 2017-08-01 10:15:54 +01:00
David Monllao
266959a41e Merge branch 'MDL-59613-master' of git://github.com/junpataleta/moodle 2017-08-01 10:29:39 +02:00
David Monllao
71b917ace6 MDL-53492 hub: Fix remaining conflict 2017-08-01 10:03:31 +02:00
David Monllao
2c04945c58 Merge branch 'wip-MDL-53492-master' of git://github.com/marinaglancy/moodle 2017-08-01 09:20:57 +02:00
Jun Pataleta
3120ebab9d MDL-59658 core: Add login/logout steps for course participants scenario
* Add student1 and student2 login/logout steps for the course
  participants filtering scenario in order to have last access data
  for students 1 and 2 since the participants table is sorted by last
  access by default.
* Remove @javascript tags for the following scenario:
  - Filter users on assignment submission page
  - Filter users on view gradebook page
  - Filter users on course participants page
  JS is not really necessary in these scenario and we can get faster
  execution time.
2017-08-01 15:09:34 +08:00
Andrew Nicols
77c5325f81 Merge branch 'MDL-9367-master' of git://github.com/ankitagarwal/moodle 2017-08-01 13:39:38 +08:00
Damyon Wiese
f28c0c7245 MDL-59206 event: Add an event for a config_log
This is useful because config_logs are sent via logstores, and we may be interested to know how
many people change a particular admin setting across many sites (aggregated data).
2017-08-01 13:18:55 +08:00
Ankit Agarwal
0d14fcbc60 MDL-9367 restore: Roll only configuration dates
It was decided to roll only configuration dates and any date related to user content
such as 'timecreated' , 'timemodified' etc should not be rolled forward.
2017-08-01 10:46:37 +05:30
David Monllao
85a9c0b1e5 Merge branch 'MDL-59299-master' of https://github.com/xow/moodle 2017-08-01 04:56:09 +02:00
Andrew Nicols
5283fa3329 Merge branch 'MDL-59473' of https://github.com/sytabaresa/moodle 2017-08-01 10:46:39 +08:00
Andrew Nicols
13822dca07 Merge branch 'MDL-28574-master' of https://github.com/xow/moodle 2017-08-01 09:59:59 +08:00
Jun Pataleta
4698e169e5 MDL-59613 course: Add dropdown menu for activity list
Part of MDL-59313.
2017-07-31 22:25:22 +08:00
David Monllao
707f9beae1 Merge branch 'MDL-59612-master' of git://github.com/junpataleta/moodle 2017-07-31 13:59:55 +02:00
Dan Poltawski
6cc8b0a4a6 Merge branch 'MDL-59632_master' of git://github.com/dmonllao/moodle 2017-07-31 11:33:05 +01:00
David Monllao
726ad1bd08 Merge branch 'MDL-59511-master-oauthsysmail' of git://github.com/Dagefoerde/moodle 2017-07-31 11:46:30 +02:00
Dan Poltawski
23e1ce7d52 Merge branch 'wip-MDL-59476-master-2' of git://github.com/marinaglancy/moodle 2017-07-31 10:21:32 +01:00
John Okely
72e688d7ff MDL-28574 webservices: Explain tokens you can edit but can't see 2017-07-31 15:35:23 +08:00
David Monllao
634d0f8330 Merge branch 'MDL-58744-master' of https://github.com/jacac/moodle 2017-07-31 08:36:18 +02:00
Marina Glancy
7d792aeee4 MDL-53492 registration: use https://moodle.net as hub url 2017-07-31 14:31:11 +08:00
Mark Nelson
585146f0ab MDL-59612 core: edit 'frametop' layout so links display for LTI
Part of MDL-59313.
2017-07-31 12:03:28 +08:00
Mark Nelson
d8cb461529 MDL-59612 core: added previous and next links to activities
Part of MDL-59313.
2017-07-31 12:03:28 +08:00
Andrew Nicols
2653e0c8e1 Merge branch 'm34_MDL-59583_Fix_MariaDB_10d2d7_Breaking_Change' of https://github.com/scara/moodle 2017-07-31 11:37:45 +08:00
John Okely
1318aec36e MDL-59299 filepicker: Display what filetypes are accepted 2017-07-31 09:58:22 +08:00
John Okely
320889c02b MDL-59299 filemanager: Display what filetypes are accepted 2017-07-31 09:58:21 +08:00
John Okely
fc7a345c35 MDL-28574 webservices: Use table_sql on manage tokens page
For pagination and sorting an partial loading.
2017-07-31 09:55:04 +08:00
John Okely
031877d2ee MDL-28574 webservices: Show all tokens for users with capability 2017-07-31 09:55:04 +08:00
John Okely
ad2ae6e3db MDL-28574 webservices: Add new capability for managing all tokens 2017-07-31 09:55:04 +08:00
Jan Dageförde
0c62ca2563 MDL-28574 webservice: Allow admins to manage tokens created by others.
Until now, admins could only modify (or even see) tokens they have
created themselves. Tokens created by other users or even other admins
were invisible unless you were looking into the database. In case there
are former admins, their successors can be unable to inspect or delete
existing tokens.
2017-07-31 09:54:33 +08:00
Jun Pataleta
198d72913f MDL-59366 core_amd: Modifications for form-autocomplete
* New optional parameter 'closeSuggestionsOnSelect' for the enhance()
function for form-autocomplete. Setting this to true will close the
suggestions popup immediately after an option has been selected. If not
specified, it defaults to true for single-select elements and false
for multiple-select elements.

Part of MDL-59290.
2017-07-28 16:11:38 +08:00
Jan Dageförde
3fa588c637
MDL-59511 oauth2: Allow empty email in system account 2017-07-28 10:07:25 +02:00
Jun Pataleta
bb1c6f85f5 MDL-59366 core: New enrolid param for get_enrolled_* functions
* New optional parameter $enrolid for the following functions:
  - get_enrolled_join()
  - get_enrolled_sql()
  - get_enrolled_with_capabilities_join()
  Setting this parameter to a non-zero value will add a condition
  to the query such that only users that were enrolled with this
  enrolment method will be returned.

Part of MDL-59290.
2017-07-28 11:32:13 +08:00
Jakob Ackermann
d674f12b7c MDL-58744 blocks: Add system context block position in non user context. 2017-07-27 09:01:29 -07:00
David Monllao
ad382c6a71 MDL-59632 search: Style search box for boost 2017-07-26 16:34:29 +02:00
David Monllao
ab4ae50603 Merge branch 'MDL-58906-master' of git://github.com/ankitagarwal/moodle 2017-07-26 14:42:38 +02:00
Ankit Agarwal
9b5d887967 MDL-58906 calendar: Remove check for _refresh_events exists 2017-07-26 12:51:27 +05:30
Andrew Nicols
d59be47602 MDL-59367 participants: Whitespace fix 2017-07-26 13:30:44 +08:00
Damyon Wiese
0ae28fad3a MDL-59367 participants: Reduce db queries
Fetch all role assignments for the course in a single query, instead of for each of the listed users.

More data but less queries.
2017-07-26 11:21:59 +08:00
Jun Pataleta
fd0a43be1b MDL-59369 enrol: Introduce data-action attribute for enrol action links 2017-07-26 09:44:33 +08:00
Jun Pataleta
5719f2ca50 MDL-59369 enrol: Edit user enrolment fragment 2017-07-26 09:44:02 +08:00
Jun Pataleta
58c20c8108 MDL-59369 enrol: New ws core_enrol_external::edit_user_enrolment 2017-07-26 09:43:16 +08:00
Sebastian Tabares Amaya
675b291d47 MDL-59473 request: Fix Loop Redirection in Oauth2 2017-07-25 16:58:53 -05:00
Dan Poltawski
afa752eb12 Merge branch 'MDL-57698-master' of https://github.com/xow/moodle 2017-07-25 11:48:09 +01:00
Matteo Scaramuccia
0510d5c757 MDL-59583 dml: fixed breaking change added w/ MariaDB 10.2.7+ 2017-07-25 12:36:23 +02:00
Dan Poltawski
7de5101d4e Merge branch 'MDL-58761_bad_regex_in_custom_step' of https://github.com/gthomas2/moodle 2017-07-25 11:06:27 +01:00
David Monllao
a2b326c232 Merge branch 'MDL-59544-master-filemanagervalidation' of git://github.com/mudrd8mz/moodle 2017-07-25 11:17:07 +02:00
David Monllao
55399cd776 Merge branch 'MDL-59578-master' of git://github.com/junpataleta/moodle 2017-07-25 11:09:44 +02:00
Matteo Scaramuccia
dae6c5dc31 MDL-59583 dml: improve perfs by unsetting the key. 2017-07-25 09:06:18 +02:00
Marina Glancy
c07c8c6e3e MDL-59476 dml: temporary mysql tables should not use compressed rows 2017-07-25 13:49:53 +08:00
Andrew Nicols
d3e69bee38 Merge branch 'MDL-56751-master' of git://github.com/jleyva/moodle 2017-07-25 10:44:05 +08:00