Commit Graph

20348 Commits

Author SHA1 Message Date
Dan Poltawski dee51f01d6 Merge branch 'MDL-56836-master' of https://github.com/snake/moodle 2016-12-06 12:46:19 +00:00
Andrew Nicols afecb4dfd5 Merge branch 'MDL-56346-master' of https://github.com/lucisgit/moodle 2016-12-06 14:34:06 +08:00
Andrew Nicols 5b67c9ecd1 Merge branch 'wip-MDL-56614-master-2' of https://github.com/marinaglancy/moodle 2016-12-06 13:37:33 +08:00
Marina Glancy 44f460c32a MDL-56614 behat: rename step for navigating in the gradebook 2016-12-06 11:49:14 +08:00
Marina Glancy e5287f9b3b MDL-56614 behat: navigate without navigation and admin blocks 2016-12-06 11:49:14 +08:00
Marina Glancy ebcff7e256 MDL-56614 behat: new steps for navigation without blocks 2016-12-06 11:49:11 +08:00
Eloy Lafuente (stronk7) 75c57a08fb MDL-57266 upgrade: add 3.2.0 separation line to all upgrade scripts 2016-12-05 17:10:20 +01:00
Eloy Lafuente (stronk7) e7a1eed154 MDL-56240 upgrade: delete incorrect lines, manually added
Note that, with MDL-57266, we are changine the comment to be:

// Automatically generated Moodle v3.2.0 release upgrade line

in order to make to make to make it clearer that it's an
automatic (part of the release process) comment and should not
be added manually ever.
2016-12-05 16:47:33 +01:00
Andrew Nicols 405666d371 Merge branch 'MDL-52840_master' of https://github.com/rezaies/moodle 2016-12-05 13:01:31 +08:00
Bram Tassyns b0c362047e MDL-56836 SCORM: player doesn't remember display mode when not logged in 2016-12-05 08:36:13 +08:00
Henning Bostelmann f4a752a2f1 MDL-45873 mode_data: Allow "0" entries in menu field 2016-12-03 15:30:12 +00:00
Eloy Lafuente (stronk7) 72edf2ef13 Merge branch 'wip-mdl-57245' of https://github.com/rajeshtaneja/moodle 2016-12-02 14:15:27 +01:00
Rajesh Taneja 43b3cf0f25 MDL-57245 behat: Use correct @_file_upload tag 2016-12-02 19:04:32 +08:00
Eloy Lafuente (stronk7) f200f74552 Merge branch 'wip-MDL-57234-master' of https://github.com/Beedell/moodle 2016-12-01 17:58:51 +01:00
John Beedell 6c45e525fc MDL-57234 Quiz report: fix exception in Responses for all users 2016-12-01 16:23:18 +00:00
Dan Poltawski 10461a04c6 Merge branch 'MDL-57207-master' of git://github.com/cameron1729/moodle 2016-11-30 09:51:21 +00:00
Cameron Ball 9a22c99ea9 MDL-57207 mod_lti: Remove redundant popover() call
Since MDL-56748 popovers are properly delegated. Making manual calls
to .popover redundant.
2016-11-30 17:45:41 +08:00
David Monllao f4aec377fc Merge branch 'MDL-56682_master' of git://github.com/markn86/moodle 2016-11-30 13:56:08 +08:00
Andrew Nicols 8018dc63c7 Merge branch 'MDL-57174_master' of git://github.com/markn86/moodle 2016-11-30 09:12:54 +08:00
Eloy Lafuente (stronk7) 04649747a4 MDL-57197 versions: bump all versions and requires near release
version = 2016120500 release version
requires= 2016112900 current rc4 version
2016-11-29 22:57:05 +01:00
Marina Glancy 59e004cd79 MDL-57187 label: allow to drag and drop video/audio files 2016-11-29 14:11:46 +08:00
David Monllao 1e102ca3ca Merge branch 'wip-mdl-57168-m1' of git://github.com/rajeshtaneja/moodle 2016-11-29 13:41:55 +08:00
Andrew Nicols 805659e1fa Merge branch 'MDL-56919-master' of git://github.com/junpataleta/moodle 2016-11-29 12:06:56 +08:00
Jun Pataleta 01dc1c11ec MDL-56919 mod_forum: Assign check icon for selected subscription mode 2016-11-29 12:03:34 +08:00
Rajesh Taneja 9eb8f6ec56 MDL-57168 behat: Don't press continue as it will go to Annotate PDF
This might cause random failures as the draft files are being accessed by other user
2016-11-29 10:53:02 +08:00
David Monllao dc3e3c0831 Merge branch 'MDL-57097-master' of git://github.com/lameze/moodle 2016-11-29 10:51:10 +08:00
Mark Nelson 8599ac9e56 MDL-57174 mod_lesson: show settings menu on edit.php page 2016-11-29 10:24:55 +08:00
Mark Nelson 4a8c6b4259 MDL-56682 mod_assign: ensure the variable is not null 2016-11-28 16:47:00 +08:00
Tony Butler 7962b4845c MDL-56346 assignfeedback_editpdf: Correct typo in property name 2016-11-25 11:09:33 +00:00
Dan Poltawski ad76556b76 Merge branch 'MDL-56948-master' of https://github.com/lucisgit/moodle 2016-11-24 15:58:05 +00:00
Andrew Nicols 9a102866be Merge branch 'MDL-56564-master-2' of git://github.com/junpataleta/moodle 2016-11-24 15:22:12 +08:00
Marina Glancy b0842f61f4 MDL-57019 behat: new step to navigate to gradebook section 2016-11-24 12:46:27 +08:00
Simey Lameze b6f549d139 MDL-57097 mod_assign: add event listener to avoid form submit 2016-11-24 11:24:25 +08:00
Jun Pataleta 144c149704 MDL-56564 mod_lti: Reset fields before updating tool matches 2016-11-24 11:09:03 +08:00
Dan Poltawski c8012422eb Merge branch 'MDL-35949' of https://github.com/timhunt/moodle 2016-11-23 12:31:22 +00:00
Dan Poltawski 68153d5cbc Merge branch 'MDL-56564-master-2' of git://github.com/junpataleta/moodle 2016-11-23 11:27:20 +00:00
Dan Poltawski 93b68886e9 Merge branch 'MDL-57093-master' of git://github.com/ryanwyllie/moodle 2016-11-23 10:32:01 +00:00
Dan Poltawski 19d8b0f9e1 Merge branch 'MDL-56182-master' of git://github.com/FMCorz/moodle 2016-11-23 08:26:38 +00:00
Andrew Nicols 2a58fef860 Merge branch 'MDL-57059-master' of git://github.com/lameze/moodle 2016-11-23 14:15:42 +08:00
Simey Lameze bea19e0dec MDL-57059 theme_boost: add rule to fix slot number misalignment 2016-11-23 13:37:55 +08:00
Jun Pataleta 1b669ebeba MDL-56564 mod_lti: External tool form fixes
* Revert disabling of the Preconfigured tool field on edit mode
* Reset LTI tool configuration fields when selecting a different
  preconfigured tool.
* Behat fixes for UI changes.
2016-11-23 13:10:51 +08:00
Andrew Nicols 44cf94a877 Merge branch 'wip-MDL-57019-master' of git://github.com/marinaglancy/moodle 2016-11-23 11:54:16 +08:00
Ryan Wyllie 52aeda247c MDL-57093 forum: less specific unread styling
Changed the CSS for unread styling to no longer use ids because the
rules are too specific and override other elements with the .unread
class on the forum pages.
2016-11-23 03:40:30 +00:00
Frederic Massart 6b7e523b5d MDL-56182 mod_lti: Include the query string when comparing type URLs 2016-11-23 10:16:50 +08:00
Dan Poltawski 4b631c2d87 Merge branch 'wip-mdl-56898-fix2' of https://github.com/rajeshtaneja/moodle 2016-11-21 15:07:49 +00:00
Dan Poltawski 9446cb507c Merge branch 'MDL-56318-master' of git://github.com/damyon/moodle 2016-11-21 09:55:09 +00:00
Damyon Wiese 21a5c3c447 MDL-56318 assign: Polish for assign grading in boost
These styles mostly remove the responsiveness from the grading form.
2016-11-21 16:59:39 +08:00
Dan Poltawski 05551a935a Merge branch 'MDL-56849-master' of git://github.com/damyon/moodle 2016-11-21 08:36:27 +00:00
Dan Poltawski f7d76254fd Merge branch 'MDL-56994-master-2' of git://github.com/junpataleta/moodle 2016-11-21 07:30:58 +00:00
Damyon Wiese 28f2458448 MDL-56849 mod_wiki: Update styles for boost
Make sure all form field have bootstrap styles. Use bootstrap tables on
tables. Remove custom styling. Prefer left-aligned text.
2016-11-21 15:19:16 +08:00