Commit graph

86480 commits

Author SHA1 Message Date
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)
dd04df4164 MDL-59672 coding style: whitespace fixes 2017-09-07 10:52:18 +02:00
Eloy Lafuente (stronk7)
9d07b88ab4 Merge branch 'MDL-59672-master' of git://github.com/lameze/moodle 2017-09-07 10:52:06 +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
Eloy Lafuente (stronk7)
d74bb0971e Merge branch 'MDL-59198-master' of git://github.com/ankitagarwal/moodle 2017-09-07 10:50:18 +02:00
Dan Poltawski
83575729b6 Merge branch 'MDL-59279_master' of git://github.com/dmonllao/moodle 2017-09-07 10:50:17 +02:00
David Monllao
4cc3f4f086 Merge branch 'MDL-59974-master' of git://github.com/lameze/moodle 2017-09-07 10:50:17 +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
72086f77f1 Merge branch 'wip-MDL-59770-master' of git://github.com/marinaglancy/moodle 2017-09-07 10:50:15 +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
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
Kathrin Osswald
88d7f109a0 MDL-60048 theme_boost: Center logo within the navbar
My solution is to remove the padding that's added within scss/bootstrap/_navbar.scss (line 72)
for the case that a logo (has-logo) is uploaded and displayed within the navbar.
Removing this padding will center the image within the navbar.
2017-09-07 08:36:11 +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
bde5631d66 MDL-59244 mod_workshop: New WS mod_workshop_delete_submission 2017-09-06 15:51:55 +02:00
Juan Leyva
e1fcba9973 MDL-59244 mod_workshop: Move event triggering to API
Event triggering when a submission is deleted is now inside the
delete_submission function.
2017-09-06 15:51:54 +02:00
Juan Leyva
c1698a37e3 MDL-59245 mod_workshop: New WS mod_workshop_update_submission 2017-09-06 15:50:16 +02: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
Juan Leyva
20da60a3b7 MDL-60018 mod_chat: Fix chatmethod field type in get_chats_by_courses WS 2017-09-06 12:15:56 +02:00
David Knuplesch
3729ff0ff4 MDL-55358 mod_lti: Add LIS Group Variable 2017-09-06 11:27:17 +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