mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
86,020 Commits 36 Branches 519 Tags
Commit Graph

23832 Commits

Author SHA1 Message Date
David Monllao
dc9f39bfc3 Merge branch 'MDL-59399-master' of git://github.com/ryanwyllie/moodle 2017-09-12 08:12:26 +02:00
David Monllao
2cef0d3ade Merge branch 'MDL-59867-master' of git://github.com/damyon/moodle 2017-09-12 07:10:46 +02:00
David Monllao
fb6ff3c553 Merge branch 'MDL-59879-master' of https://github.com/abias/moodle 2017-09-12 07:04:34 +02:00
Eloy Lafuente (stronk7)
e658430a88 Merge branch 'MDL-59761-master' of git://github.com/danpoltawski/moodle 2017-09-12 01:43:19 +02:00
Dan Poltawski
52516f2b19 Merge branch 'MDL-35849-master' of git://github.com/ankitagarwal/moodle 2017-09-11 14:18:51 +01:00
Jun Pataleta
eca853c8eb Merge branch 'MDL-59977_master' of git://github.com/markn86/moodle 2017-09-11 17:18:16 +08:00
Mark Nelson
93b47710ac MDL-59977 core: do not directly check 'viewparticipant' capability 2017-09-11 12:44:27 +08:00
Jun Pataleta
4dfc2d19e7 Merge branch 'wip-MDL-35668-master' of git://github.com/marinaglancy/moodle 2017-09-11 11:01:41 +08:00
David Monllao
0a68e283d0 MDL-59657 analytics: Move lang string to correct location 2017-09-07 10:58:38 +02:00
Eloy Lafuente (stronk7)
95fc1e720c Merge branch 'MDL-59983-master-enfix' of git://github.com/mudrd8mz/moodle 2017-09-07 10:58:35 +02:00
Juan Leyva
35b9bca0ca MDL-58762 core: Get full course objects on navigation 
The course object passed as parameter to extend_navigation_user
callback contained only a few parameters, some parameters like
showgrades or showreports were missing.
The callback should receive a full course object.
 2017-09-07 10:53:33 +02:00
David Monllao
0e0e92c5e0 Merge branch 'MDL-59759-master-2' of git://github.com/junpataleta/moodle 2017-09-07 10:52:20 +02:00
Jun Pataleta
305f38d310 Merge branch 'm34_MDL-59635_Properly_Escape_Column_Names_Reserved_Words_Proof' of https://github.com/scara/moodle 2017-09-07 10:52:19 +02:00
Eloy Lafuente (stronk7)
59e56e7f71 Merge branch 'MDL-59696-master' of git://github.com/junpataleta/moodle 2017-09-07 10:50:18 +02:00
David Monllao
44e1928532 Merge branch 'wip-MDL-59768-master' of git://github.com/marinaglancy/moodle 2017-09-07 10:50:16 +02:00
Dan Poltawski
edb911984a Merge branch 'MDL-59786_master' of git://github.com/dmonllao/moodle 2017-09-07 10:50:15 +02:00
David Monllao
e8466eee81 Merge branch 'master-MDL-59799' of https://github.com/jojoob/moodle 2017-09-07 10:50:14 +02:00
David Monllao
c4f7a1c001 Merge branch 'wip-MDL-59815-master' of git://github.com/abgreeve/moodle 2017-09-07 10:50:11 +02:00
David Monllao
c0bcec46f7 Merge branch 'wip-MDL-59898-master-test' of git://github.com/abgreeve/moodle 2017-09-07 10:49:34 +02:00
David Monllao
5700cf959e Merge branch 'MDL-59961_file_validation' of https://github.com/mrmark/moodle 2017-09-07 10:46:57 +02:00
Damyon Wiese
b7df2485e6 MDL-59867 autocomplete: Prevent duplicate ids. 
Rendering a form with 2 autocompletes in it can get messed up because of duplicated ids.
 2017-09-07 09:31:57 +08:00
Dan Poltawski
d9dff92fef MDL-59761 eslint: Auto-fix some minor lint warnings 2017-09-06 08:53:50 +01:00
Ryan Wyllie
7d659f2167 MDL-59399 atto: make media plugin shortform explandable 2017-09-06 05:24:21 +00:00
Helen Foster
7698619bc6 MDL-59983 lang: Merge English strings from the en_fix language pack 
Significant string changes:

* mobileappenabled, setuplink and setuplink_desc in tool_mobile -
  improved wording
* getmoodleonyourmobile and custommenuitems_desc in tool_mobile -
  improved wording
 2017-09-05 11:01:09 +02:00
Ankit Agarwal
d4062a0cff MDL-35849 login: Add role alert to error messages 
Error messages should be prominent to screen readers as well as visual users,
adding the role alert is recommended way to achieve it for screen readers and this is
also what we do for ->notification apis
 2017-09-05 12:43:37 +05:30
Matteo Scaramuccia
ea34d02d55 MDL-59635 tool_replace: Escape the column name. 2017-09-04 11:46:55 +02:00
Matteo Scaramuccia
596f4e6a23 MDL-59635 ddl: Added test_get_enc_quoted(). 2017-09-04 11:46:54 +02:00
Jun Pataleta
237efd4f0d MDL-59759 core_amd: Deprecate core/modal_confirm 2017-09-04 10:44:46 +08:00
Jun Pataleta
1e9a102b58 MDL-59696 templates: Remove form-group div for url-select template 
* Removed the div with the class 'form-group' that's enclosing the
select element and friends. It's not needed since the urlselect template
is an inline form.
* Also, for completeness, I added the helpicon data for the template's
context.
 2017-09-04 10:10:46 +08:00
Tobias Garske
06ced40c2f MDL-59898 access: Added Icon references. 2017-09-04 09:55:07 +08:00
Johannes Burk
1dcd1a071c MDL-59799 course: Include course/lib.php before using move_courses(). 2017-09-01 16:46:26 +02:00
David Monllao
1a5204a427 MDL-59786 analytics: Discard invalid samples 2017-09-01 11:13:07 +02:00
Marina Glancy
96e1633f57 MDL-59768 tasks: schedule task only if it is not scheduled 2017-08-31 14:31:17 +08:00
Marina Glancy
ed483bda8d MDL-35668 filebrowser: system context is similar to coursecat 2017-08-31 13:56:59 +08:00
Damyon Wiese
d29be32000 MDL-59801 users: Behat fixes 
Firstly - the list of roles to filter needs to be a combination of the assignable roles and the existing roles in the course.
Secondly - the auto-complete behat step needs to search for entire strings, not substrings.
 2017-08-31 12:32:03 +08:00
Damyon Wiese
5c1d5a6d7c MDL-59828 inplaceeditable: CSS class fix 
The form-autocomplete-original-select was applied to the wrong element.

inplaceeditable selects => inplaceeditable autocompletes
 2017-08-31 10:16:53 +08:00
Marina Glancy
84d815611c MDL-35668 filebrowser: perf improvements for courses 
When searching for non-empty children first retrieve list of all non-empty
fileareas in modules and then check access for each of them. This will be
much faster than checking access for each module and then look for files
and areas inside this module.

Do the same with course file areas
 2017-08-30 12:43:26 +08:00
Marina Glancy
10122f009e MDL-35668 filebrowser: small improvements to modules 
- Store cm_info in file_info_context_module instead of object
- Use correct API calls to component_callback_exists
- Use human readable name of module type
 2017-08-30 12:43:26 +08:00
Marina Glancy
ade66228fa MDL-35668 filebrowser: cache enrolled courses 2017-08-30 12:43:26 +08:00
Marina Glancy
2d939622b8 MDL-35668 filebrowser: perf improvements to coursecat 
- Preload contexts of subcategories and courses when retrieving their lists
- When there are enrolled courses in hidden subcategories retrieve them together with direct children courses
- Do not call browser->get_file_info - it retrieves the coursecat/course again, instead initialise the instance
of file_info_context_coursecat or file_info_context_course
 2017-08-30 12:43:22 +08:00
Peter Spicer
9c064d0380 MDL-59815 access: Fix definition of risks for user:delete. 2017-08-30 11:31:18 +08:00
Jun Pataleta
9e22016778 Merge branch 'MDL-59884-master' of git://github.com/lameze/moodle 2017-08-30 10:10:30 +08:00
Simey Lameze
8dc85f9c04 MDL-59884 core: add new overlay_loading template 2017-08-30 09:44:22 +08:00
Eloy Lafuente (stronk7)
a4cdbff86c MDL-59713 forms: prevent php warning when 'optional' option is missing 2017-08-29 20:12:41 +02:00
Dan Poltawski
e517eb100c Merge branch 'MDL-59951-master' of git://github.com/damyon/moodle 2017-08-29 14:32:43 +01:00
Dan Poltawski
253ea6621a Merge branch 'MDL-59615-master' of git://github.com/damyon/moodle 2017-08-29 10:58:42 +01:00
Jun Pataleta
4f9dfd0f8d Merge branch 'MDL-59628-master' of git://github.com/damyon/moodle 2017-08-29 13:49:55 +08:00
Andrew Nicols
d3e6c398f4 Merge branch 'MDL-35290-master' of https://github.com/snake/moodle 2017-08-29 13:14:22 +08:00
Damyon Wiese
26c4d2bf79 MDL-59628 forms: Get a valid zindex for datepicker 
We have a way to determine a valid zindex when adding things to a page. Find all the moodle-has-zindex things and
choose a value bigger all of them. This needs doing in javascript whenever a thing is opened. It's not possible to
fix generically in CSS (remember the historic z-index wars).
 2017-08-29 12:09:59 +08:00
Andrew Nicols
85419c5b2e Merge branch 'MDL-59828-master' of git://github.com/damyon/moodle 2017-08-29 11:56:28 +08:00