1
0
mirror of https://github.com/moodle/moodle.git synced 2025-03-29 12:02:39 +01:00

86061 Commits

Author SHA1 Message Date
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
Dan Poltawski
f48b861302 Merge branch 'MDL-59840_master' of git://github.com/dmonllao/moodle 2017-09-07 10:50:13 +02:00
Dan Poltawski
c1346b1476 Merge branch 'wip-MDL-59992-master' of git://github.com/marinaglancy/moodle 2017-09-07 10:50:13 +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
d8e789c837 Merge branch 'MDL-59846-master' of git://github.com/lameze/moodle 2017-09-07 10:49:36 +02:00
Dan Poltawski
0426cc9533 Merge branch 'MDL_59834-Indexing_of_personal_messages' of https://github.com/mattporritt/moodle 2017-09-07 10:49:35 +02:00
David Monllao
f827adbd91 Merge branch 'MDL-59864-master' of git://github.com/lameze/moodle 2017-09-07 10:49:34 +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
Dan Poltawski
2d64ffeb6b Merge branch 'MDL-59657_master' of git://github.com/dmonllao/moodle 2017-09-07 10:49:30 +02:00
David Monllao
076d95ccc4 Merge branch 'MDL-59963-report-logs-origin-pagination' of https://github.com/lucaboesch/moodle 2017-09-07 10:46:57 +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
Dan Poltawski
3c4675a002 Merge branch 'MDL-59153_master' of git://github.com/dmonllao/moodle 2017-09-07 10:46:56 +02:00
Ryan Wyllie
ea5f7707e7 MDL-59919 calendar: add file support to event form 2017-09-07 01:38:43 +00: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
Marina Glancy
9971fac803 MDL-59808 webservice_rest: comply with restformat argument 2017-09-07 08:34:10 +08:00
Juan Leyva
c2cf2450ac MDL-59243 mod_workshop: New WS mod_workshop_add_submission 2017-09-06 14:00:17 +02:00
Juan Leyva
4c776cae2d MDL-59243 mod_workshop: Move submission creation to API 2017-09-06 13:57:11 +02:00
Juan Leyva
b1ed7279e0 MDL-60025 mod_book: Return correct values for chapters update time
Instead returning the time when the chapter was created or modified we
were returning the time when the book was created or modified.
2017-09-06 12:37:21 +02:00
Dan Poltawski
d9dff92fef MDL-59761 eslint: Auto-fix some minor lint warnings 2017-09-06 08:53:50 +01:00
Dan Poltawski
6f601313f0 MDL-59761 eslint: support glob-based configuration
Since ESlint 4.1.0 [1], it's possible to support glob-based
configuration, this means we can move glob configuration out of grunt
and into the config file, which means tools will respect the glob rules
now too. :)

[1] http://eslint.org/blog/2017/06/eslint-v4.1.0-released
2017-09-06 08:53:50 +01:00
Dan Poltawski
9702503f6b MDL-59761 eslint: Upgrade to v4.4.1
Including adding some new default rules.
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
Andrew Nicols
5ded18d5a8 MDL-60031 admin: Move risk longtext to pix title 2017-09-06 10:23:48 +08:00
David Mudrák
6806a3734a MDL-59983 lang: Fix Forum behat scenarios to use the new strings 2017-09-05 11:01:10 +02: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
sam marshall
e36eefaeea MDL-59926 core_search: Allow Behat testing of results screens 2017-09-04 17:42:53 +01:00
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
7800e6881c MDL-59759 core_user: Use SAVE_CANCEL modal for unenrol dialog 2017-09-04 10:44:51 +08:00
Jun Pataleta
23356f410f MDL-59759 core_message: Use SAVE_CANCEL modal for delete dialog 2017-09-04 10:44:51 +08:00
Jun Pataleta
fb7fa04e3b MDL-59759 core_calendar: Use SAVE_CANCEL modal for delete dialog
* Plus reorganise the code to make it a little tidier.
2017-09-04 10:44:51 +08:00
Jun Pataleta
237efd4f0d MDL-59759 core_amd: Deprecate core/modal_confirm 2017-09-04 10:44:46 +08:00
Jun Pataleta
357dc2cbeb MDL-59696 theme_bootstrapbase: Set max-width for custom-select elements
* Set custom-select elements with a maximum width of 100% of their
container.
2017-09-04 10:10: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
Simey Lameze
da1f058254 MDL-59974 core_calendar: remove JS code no longer used 2017-09-04 09:49:12 +08:00
Simey Lameze
4d7f28d4fc MDL-59974 core_calendar: hide elements based on event type 2017-09-04 09:48:41 +08:00
Adrian Greeve
e5e47a4bdf MDL-55849 mod_assign: Behat update for group submission reopening. 2017-09-04 09:23:32 +08:00
Adrian Greeve
75c21e7e77 MDL-55849 mod_assign: Reopening assignments only increases by one.
Group assignments when being reopened will only increase the
attempt total by one.
2017-09-04 09:23:32 +08:00
Simey Lameze
29158c8b6f MDL-59672 core_calendar: set course event type on course context 2017-09-04 09:12:05 +08:00
Simey Lameze
0b8e721667 MDL-59846 core_calendar: add styling to action link 2017-09-04 08:38:51 +08:00
Simey Lameze
7b7924922e MDL-59864 core_calendar: add behat test for module events edit 2017-09-04 08:37:30 +08:00
Simey Lameze
4757780aea MDL-59864 core_calendar: add link to activity on module events 2017-09-04 08:37:30 +08:00
Matt Porritt
bc60052d83 MDL-59834 Global Search: Indexing user messages
Make indexing of user messages tolerant to user deletion.
When creating the search document for user messages,
add a check to see if the user has been deleted in the
system. If they have been deleted abort creating the search
document.
This is to avoid rasining an error when trying to get the
user context for a deleted user.
2017-09-04 09:09:48 +10:00
Matt Porritt
4e921569d0 MDL-59459 Golbal Search: Increase file indexing coverage
Increase the scope of the files that are detected and
indexed by Moodle's Global Search. This includes intro
and content areas of search areas. The use case here is
in a description for an activity there is a file added
that contains more information about the activity.
It would an advantage to be able to search this content
as well. It would also allow search engine plugins to be
able to index non text files such as images.
2017-09-02 10:28:17 +10:00
Johannes Burk
1dcd1a071c MDL-59799 course: Include course/lib.php before using move_courses(). 2017-09-01 16:46:26 +02:00
Luca Bösch
30375ee99f MDL-53936 reports: State default index page explicitly in pagination url 2017-09-01 11:42:10 +02:00
Luca Bösch
d99bec321b MDL-59963 reports: origin parameter looked at in log reports 2017-09-01 11:41:29 +02:00