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
85,965 Commits 36 Branches 519 Tags
Commit Graph

85965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Dallimore
859e62e7fa MDL-59893 assign: don't prefix file links when downloading as folders 
Change to download_rewrite_pluginfile_urls() ensuring prefix isn't
added to file links when downloading with the  downloadasfolders
user preference set to true. Links to files in onlinetext now work
when downloading as folders.
 2017-08-22 12:56:45 +08:00
Jake Dallimore
a15dfc6682 MDL-59893 assign: fixes for groupname prefix when downloading 
assign->download_submissions():
- groupname now only added to zip file name if not empty, fixing a
double hyphen bug in the file name.
assign->download_rewrite_pluginfile_urls():
- groupname is now correctly determined using get_submission_group()
instead of using groups_get_activity_group() which fails when there
is no active activity group set. Uses the same logic that
download_submission() uses to prefix file names. Fixes a bug where an
empty groupname prefix was generated, resulting in broken links.
 2017-08-22 12:56:28 +08:00
Jun Pataleta
f8de8cb314 Merge branch 'MDL-59204_master_v2' of git://github.com/markn86/moodle 2017-08-22 12:46:23 +08:00
Andrew Nicols
51483e4a4e Merge branch 'MDL-57246-33-forumredirect' of git://github.com/roperto/moodle 2017-08-22 12:26:42 +08:00
Mark Nelson
2fa1f92a82 MDL-59204 analytics: help icons for target, indicators and time method 2017-08-22 12:07:00 +08:00
Andrew Nicols
ea8b25c51f Merge branch 'MDL-59702' of https://github.com/andrewhancox/moodle 2017-08-22 11:01:30 +08:00
Andrew Nicols
b4b61be922 Merge branch 'MDL-59860-master-fix' of https://github.com/lameze/moodle 2017-08-22 10:51:52 +08:00
Simey Lameze
1228bb6cad MDL-59860 core_calendar: fix behat failures 2017-08-22 09:40:01 +08:00
Adrian Greeve
e3909e5853 MDL-59881 question bank: Use supplied function parameters. 
question_usage_by_activity::start_all_questions now uses all
three of the parameters that are defined.
 2017-08-22 09:30:04 +08:00
Eloy Lafuente (stronk7)
2345ae252e Merge branch 'MDL-59661_master' of git://github.com/dmonllao/moodle 2017-08-22 01:41:29 +02:00
Eloy Lafuente (stronk7)
eb2e291716 Merge branch 'MDL-55937-master' of git://github.com/ankitagarwal/moodle 2017-08-21 23:17:24 +02:00
Eloy Lafuente (stronk7)
6b1e790231 Merge branch 'MDL-59049-master' of https://github.com/snake/moodle 2017-08-21 23:09:09 +02:00
AMOS bot
58b8be6c97 Automatically generated installer lang files 2017-08-22 00:05:56 +08:00
Davo Smith
910b02734c MDL-59195 mod_assign: add behat tests for comments error 2017-08-21 10:23:01 +01:00
Davo Smith
ec0ecdaf6e MDL-59195 assignsubmission_comments: fix permission checks 2017-08-21 10:23:01 +01:00
Jun Pataleta
8711ab92a9 Merge branch 'MDL-59809-master-fix' of git://github.com/junpataleta/moodle 2017-08-21 17:01:24 +08:00
Jun Pataleta
bf3d824a97 MDL-59809 boost: Make stylelint happy 2017-08-21 16:58:33 +08:00
Jun Pataleta
66d08a2122 Merge branch 'MDL-59809-master' of git://github.com/damyon/moodle 2017-08-21 16:30:37 +08:00
Simey Lameze
74ed81e1f5 MDL-59675 core_calendar: reload calendar region after add event 2017-08-21 16:19:46 +08:00
Simey Lameze
ff5e2d9cad MDL-59676 core_calendar: reload calendar region after event edit 2017-08-21 16:13:32 +08:00
Andrew Nicols
e825859078 Merge branch 'MDL-59677-master-fix' of git://github.com/lameze/moodle 2017-08-21 15:58:42 +08:00
Simey Lameze
47b55dade4 MDL-59677 core_calendar: add missing return on changeMonth promises 2017-08-21 15:52:55 +08:00
Andrew Nicols
0813f00d0f Merge branch 'MDL-59677-master' of git://github.com/lameze/moodle 2017-08-21 15:33:40 +08:00
Cameron Ball
5e6a36f845
MDL-59885 assignfeedback_editpdf: Correctly report combination status 2017-08-21 15:32:02 +08:00
Andrew Nicols
b7173c18e9 Merge branch 'MDL-59687-master' of git://github.com/lameze/moodle 2017-08-21 15:20:22 +08:00
Simey Lameze
516e74440a MDL-59677 core_calendar: delete event without reload whole page 2017-08-21 15:20:14 +08:00
Andrew Nicols
3951c81589 Merge branch 'MDL-59674-master' of git://github.com/lameze/moodle 2017-08-21 15:14:15 +08:00
Andrew Nicols
ba756e857b Merge branch 'MDL-59699-master' of git://github.com/lameze/moodle 2017-08-21 14:15:41 +08:00
Andrew Nicols
b34b6b4fe8 Merge branch 'MDL-59860-master' of git://github.com/lameze/moodle 2017-08-21 14:11:44 +08:00
Simey Lameze
4cc382d5c7 MDL-59674 core_calendar: add group name to summary template 2017-08-21 14:07:07 +08:00
Simey Lameze
a1e166e7c3 MDL-59674 core_calendar: add group name to event exporter 2017-08-21 14:07:03 +08:00
Simey Lameze
21e3d8b8a3 MDL-59699 core_calendar: add steps to assert the course link 2017-08-21 13:35:53 +08:00
Simey Lameze
00d2d344a2 MDL-59699 core_calendar: add course link to course events 2017-08-21 13:33:51 +08:00
Andrew Nicols
b05f2cd794 MDL-59859 enrol_manual: Improve modal creation ordering 2017-08-21 13:00:00 +08:00
Andrew Nicols
17137d471d MDL-59859 core: Accept Promise for save button 
Accept either a promise, or a string for the content of the save button
in the save / cancel modal.
 2017-08-21 12:54:34 +08:00
John Okely
52fe3c4683 MDL-57412 course: Unit test get_view_url for course formats 2017-08-21 12:49:59 +08:00
John Okely
1832b68142 MDL-57412 navigationlib: Respect linkcoursesections again 2017-08-21 12:49:58 +08:00
Jun Pataleta
3a3530a863 Merge branch 'MDL-59733-master' of https://github.com/xow/moodle 2017-08-21 10:40:27 +08:00
Jun Pataleta
3a0e3c34b0 MDL-59663 course: Render the appropriate course-category tree action 2017-08-21 10:01:37 +08:00
Andrew Nicols
3e0df465db MDL-59784 core: Refactor addblock to listen earlier 2017-08-18 22:51:48 +08:00
Andrew Nicols
728357707d MDL-59784 core: Modal factory should listen before fetching templates 2017-08-18 22:51:48 +08:00
Andrew Nicols
e2b503043e MDL-59784 core: Modal should accept title as a promise 2017-08-18 22:51:47 +08:00
Eloy Lafuente (stronk7)
0f74ed2981 Merge branch 'MDL-59836-master' of git://github.com/junpataleta/moodle 2017-08-18 12:36:17 +02:00
Mark Nelson
7851842f4b MDL-59204 core: add getters to lang_string for identifier and component 2017-08-18 18:02:39 +08:00
Mark Nelson
b94814fa91 MDL-59204 analytics: added corresponding name '_help' strings 
Strings are intentionally left blank as they will be done later by
AMOS.
 2017-08-18 18:02:38 +08:00
Mark Nelson
7e00aa725a MDL-59204 analytics: changed get_name so that it returns a lang_string 
This was done for indicators, targets and time splitting methods so that we
can get the string identifier and component in order to display a help_icon.

The functions were also made abstract, removing the default implementation.
Indicators, targets and time splitting methods should define this function.
 2017-08-18 18:02:38 +08:00
Simey Lameze
6a87019b13 MDL-59860 core_calendar: behat scenario for module events 2017-08-18 12:29:49 +08:00
Simey Lameze
4c3cd3c1b4 MDL-59860 core_calendar: add editurl parameter back 2017-08-18 12:05:30 +08:00
Jun Pataleta
68a0485c5c MDL-59836 core_amd: Use only one input event handler 
* We have duplicate input event handlers for the autocomplete element
which are both firing when the input element's value is being set.
In case an AJAX handler is defined for the autocomplete suggestions,
this causes the autocomplete suggestions so show "No suggestions" first
and then load the results from the AJAX handler a little bit later.
 2017-08-18 11:19:08 +08:00
Simey Lameze
ed84d85fdb MDL-59687 core_calendar: calendar feature improvement 2017-08-18 11:13:27 +08:00