moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 02:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81874 commits 37 branches 544 tags 1.3 GiB
Commit graph

81874 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Monllao
29dfbb422f Merge branch 'MDL-56842-master' of git://github.com/danpoltawski/moodle 2016-11-17 12:28:34 +08:00
David Monllao
9ecf0674ff Merge branch 'MDL-56870-master-v2' of https://github.com/snake/moodle 2016-11-17 12:18:26 +08:00
Andrew Nicols
76acac80eb Merge branch 'MDL-56978_iconv' of https://github.com/mrmark/moodle 2016-11-17 11:20:39 +08:00
Jake Dallimore
a428cf4ac8 MDL-56870 lib: block access to deleted module in require_login 2016-11-17 10:57:13 +08:00
David Monllao
0915860e51 Merge branch 'MDL-52186-master' of git://github.com/junpataleta/moodle 2016-11-17 10:42:08 +08:00
Jun Pataleta
b62bebbf1c MDL-52186 enrol_meta: Sync only active enrol_meta instances 
Thanks to Peter Klinka for the solution!
 2016-11-17 10:40:54 +08:00
David Monllao
75166d0627 Merge branch 'wip-mdl-56865' of https://github.com/rajeshtaneja/moodle 2016-11-17 10:35:38 +08:00
David Monllao
6dc3a5b699 Merge branch 'MDL-56915-master' of git://github.com/FMCorz/moodle 2016-11-17 10:32:00 +08:00
Andrew Nicols
50e16a67ab Merge branch 'MDL-56767-master' of git://github.com/danpoltawski/moodle 2016-11-17 10:07:35 +08:00
David Monllao
a813b0c3dc Merge branch 'MDL-56999-master' of git://github.com/damyon/moodle 2016-11-17 09:31:07 +08:00
Rajesh Taneja
920d7ffadd
MDL-56865 behat: Don't set error handler for behat install 2016-11-17 08:56:54 +08:00
Andrew Nicols
84c8c00959 Merge branch 'wip-mdl-56603' of https://github.com/rajeshtaneja/moodle 2016-11-17 08:51:47 +08:00
Rajesh Taneja
d48c0a1d9a
MDL-56603 behat: Fixed search messages string to use id 2016-11-17 08:46:32 +08:00
Eloy Lafuente (stronk7)
7b0057b895 Merge branch 'MDL-56922-master' of git://github.com/danpoltawski/moodle 2016-11-17 01:38:24 +01:00
Mark Nielsen
6670d28fbc MDL-56978 core: fix error handling in min_fix_utf8 
Must completely suppress notice from iconv as Behat's
shutdown function uses error_get_last() which is
unable to detect if the error was suppressed or not.
 2016-11-16 08:59:15 -08:00
Dan Poltawski
6182ec8901 MDL-56842 boost: add example context to login template 2016-11-16 13:59:47 +00:00
Dan Poltawski
16732d0631 MDL-56842 boost: load required js on login page 2016-11-16 13:59:47 +00:00
Dan Poltawski
7d3a7bbd1f Merge branch 'MDL-33960-lti-scroll' of https://github.com/gabrielrosset/moodle 2016-11-16 13:03:38 +00:00
Dan Poltawski
3b195bfb81 MDL-56922 theme_boost: grey out activity icon when hidden 
This was present in bootstrapbase and is I think an important visual
distinction.
 2016-11-16 11:58:42 +00:00
David Monllao
e3cb80f10c Merge branch 'wip-MDL-56847-master' of git://github.com/marinaglancy/moodle 2016-11-16 19:38:08 +08:00
Eloy Lafuente (stronk7)
904fcbee8b Merge branch 'MDL-55362_master' of git://github.com/Chocolate-lightning/moodle 2016-11-16 11:29:01 +01:00
Frederic Massart
6321934c73 MDL-56205 theme_boost: Adjust margin between icon and caret in dropdowns 2016-11-16 10:20:53 +00:00
Eloy Lafuente (stronk7)
751122dbc0 Merge branch 'MDL-56908-master' of git://github.com/danpoltawski/moodle 2016-11-16 11:18:15 +01:00
Dan Poltawski
c1e74a0937 Merge branch 'MDL-56965-master' of git://github.com/ankitagarwal/moodle 2016-11-16 10:08:10 +00:00
Dan Poltawski
f882aed3b3 Merge branch 'wip-MDL-56776-master' of git://github.com/marinaglancy/moodle 2016-11-16 09:46:10 +00:00
Eloy Lafuente (stronk7)
e7b9ea226c Merge branch 'MDL-56911-master' of git://github.com/ankitagarwal/moodle 2016-11-16 10:33:09 +01:00
Dan Poltawski
1bf9d6ac92 Merge branch 'MDL-56889-master' of git://github.com/danpoltawski/moodle 2016-11-16 09:20:28 +00:00
Frederic Massart
35b48c7aed
MDL-56915 webdav: Increase maximum expected header size 2016-11-16 17:19:19 +08:00
Dan Poltawski
706e012fd6 MDL-56889 boostrapbase: remove excessive stylelint-disables 
From bs4-compat.less, replace with file level disable instead.
 2016-11-16 08:50:14 +00:00
Simey Lameze
660b51e013 MDL-56889 bootstrapbase: create static bs4 compatible mixins 2016-11-16 08:50:08 +00:00
Dan Poltawski
6dc4c68e4e MDL-56767 block_login: Use btn-block as suggested by Andrew 2016-11-16 08:09:14 +00:00
Marina Glancy
4125ce046b MDL-56776 calendar: display month above the dates 
month is displayed in table caption which is by default in the bottom in BS4
 2016-11-16 15:46:56 +08:00
Andrew Nicols
7da7c1e24a Merge branch 'wip-MDL-56603-master-v2' of git://github.com/abgreeve/moodle 2016-11-16 15:36:37 +08:00
Damyon Wiese
3eb9cc2f6e MDL-56999 boost: Maintenance layout needs padding 2016-11-16 15:18:27 +08:00
Adrian Greeve
d3d0248afc MDL-56603 message: Added see all link to message popup. 2016-11-16 14:51:17 +08:00
Adrian Greeve
8151761378 MDL-56603 messaging: Add a new message link to popup. 
Added a link to create a new message from the message
popup menu.
 2016-11-16 14:51:17 +08:00
Andrew Nicols
faadaedb17 Merge branch 'wip-mdl-56710' of https://github.com/rajeshtaneja/moodle 2016-11-16 14:14:26 +08:00
Andrew Nicols
0064cb1193 Merge branch 'MDL-56967-master' of git://github.com/damyon/moodle 2016-11-16 14:05:07 +08:00
Andrew Nicols
a435242491 Merge branch 'wip-mdl-56981' of https://github.com/rajeshtaneja/moodle 2016-11-16 14:00:40 +08:00
David Monllao
70d2c9fcf8 Merge branch 'MDL-56784-master' of git://github.com/cameron1729/moodle 2016-11-16 13:49:51 +08:00
David Monllao
12ebaf1c6b Merge branch 'MDL-56187-master' of git://github.com/damyon/moodle 2016-11-16 13:35:38 +08:00
Cameron Ball
8712a50ec2
MDL-56784 theme_boost: Fix escaped markup in filemanager_fileselect 
The markup in the filemanager_fileselect template was being escaped,
causing a help icon not to display.

Additionally, the popover for the help icon was not display since
"loader.js" was not properly delegating the popover calls.
 2016-11-16 13:10:51 +08:00
David Monllao
97279f8d5d Merge branch 'MDL-56139_master' of git://github.com/markn86/moodle 2016-11-16 11:51:18 +08:00
Andrew Nicols
90677673da Merge branch 'MDL-56958-master' of git://github.com/damyon/moodle 2016-11-16 11:07:20 +08:00
Mark Nelson
af5765b3fb MDL-56139 core_message: removed unused constants 2016-11-16 10:22:52 +08:00
Mark Nelson
ffd7798c96 MDL-56139 core: changes after peer review 
- No longer use the Fibonacci sequence for delaying the timeout.
  It is too aggressive.
- The backoff_timer AMD module now expects the callback AND the
  backoff function to be passed to the constructor.
- Added ability to specify polling frequency in config.php.
- Added helper function to return the cache key.
- Reworded the parameters for clarity.
 2016-11-16 10:22:52 +08:00
Ryan Wyllie
fb1469d84f MDL-56139 message: ajax poll for new messages in message area 2016-11-16 10:22:33 +08:00
Andrew Nicols
583278f070 Merge branch 'MDL-56703-master' of git://github.com/damyon/moodle 2016-11-16 10:16:09 +08:00
Andrew Nicols
901c0ea7de Merge branch 'wip_MDL-48055_master_quiz_activity_report_grade_visibility' of https://github.com/POETGroup/moodle 2016-11-16 10:08:13 +08:00
David Monllao
8898725385 Merge branch 'MDL-56921_master' of https://github.com/nadavkav/moodle 2016-11-16 10:04:37 +08:00