Commit graph

82484 commits

Author SHA1 Message Date
Simey Lameze
71fa2be932 MDL-57114 filemanager: apply btn-sm class to buttons
This commit also creates a new css rule to fix the file picker icons misalignment.
2016-12-20 10:34:29 +00:00
David Monllao
d6db7a1d9a Merge branch 'MDL-56640-master' of git://github.com/danpoltawski/moodle 2016-12-20 11:09:39 +01:00
Dan Poltawski
3f56d612ec MDL-56640 templates: add example content 2016-12-20 10:02:06 +00:00
Dan Poltawski
d83d87f6ac MDL-56640 yui: remove moodle-core-formautosubmit
It's easily achieved with jquery primatives
2016-12-20 10:02:06 +00:00
Dan Poltawski
9c9201ecde MDL-56640 lesson: switch from YUI to jquery.change() 2016-12-20 10:02:06 +00:00
Dan Poltawski
588b84f78a MDL-56640 js: yui to jquery for formautosubmit in select templates
I did not keep the 'nothing' behaviour in the js because I don't think
the nothing option needs special handling, given that its default
selection.
2016-12-20 10:02:05 +00:00
Dan Poltawski
988a031a61 Merge branch 'MDL-54996_m33v1' of https://github.com/sbourget/moodle 2016-12-20 09:19:23 +00:00
Rajesh Taneja
7737744d1b
MDL-53814 behat: Columns have been moved ahead 2016-12-20 11:36:00 +08:00
Eloy Lafuente (stronk7)
de5e61c4ba Merge branch 'MDL-57268-master' of https://github.com/xow/moodle 2016-12-20 02:22:26 +01:00
Dan Poltawski
caf52b578b Merge branch 'MDL-57386-master' of git://github.com/damyon/moodle 2016-12-19 15:46:54 +00:00
Dan Poltawski
7d64e2c3bc Merge branch 'MDL-55568_m33v2' of https://github.com/sbourget/moodle 2016-12-19 14:33:05 +00:00
David Monllao
d17b70dda2 MDL-56320 tool_mobile: rest protocol dependency added 2016-12-19 15:11:00 +01:00
David Monllao
ef9a1a2aff Merge branch 'MDL-56320-m' of https://github.com/micaherne/moodle 2016-12-19 15:05:14 +01:00
David Monllao
e3578224cc Merge branch 'MDL-55575_B' of https://github.com/bostelm/moodle 2016-12-19 14:59:13 +01:00
David Monllao
902b32bd1b Merge branch 'MDL-56527-master' of git://github.com/mudrd8mz/moodle 2016-12-19 14:03:53 +01:00
Dan Poltawski
c67e93b235 MDL-56640 templates: move select templates from boost to core 2016-12-19 12:23:54 +00:00
Dan Poltawski
64e032b6da Merge branch 'wip-MDL-56912-master' of git://github.com/marinaglancy/moodle 2016-12-19 12:21:06 +00:00
Eloy Lafuente (stronk7)
f4f63fa6b0 Merge branch 'MDL-57270_master' of git://github.com/markn86/moodle 2016-12-19 13:04:16 +01:00
Eloy Lafuente (stronk7)
e857608ba2 Merge branch 'MDL-57293-master' of git://github.com/danpoltawski/moodle 2016-12-19 13:02:09 +01:00
David Monllao
a127f448f0 Merge branch 'MDL-57143-master' of https://github.com/LukeCarrier/moodle 2016-12-19 12:54:04 +01:00
David Monllao
eacacae8cc Merge branch 'wip-MDL-57187-master' of https://github.com/marinaglancy/moodle 2016-12-19 12:46:19 +01:00
Dan Poltawski
dc87f411dd Merge branch 'MDL-52098_master' of git://github.com/Chocolate-lightning/moodle 2016-12-19 11:25:47 +00:00
David Monllao
034996876c Merge branch 'MDL-57402' of git://github.com/timhunt/moodle 2016-12-19 12:20:57 +01:00
David Monllao
c1c0d9b9cf Merge branch 'MDL-41729-master' of git://github.com/lameze/moodle 2016-12-19 11:51:43 +01:00
David Monllao
2b5c9f04e3 Merge branch 'MDL-53814-question-type-icon-quiz-manual-grading-overview' of https://github.com/lucaboesch/moodle 2016-12-19 11:38:43 +01:00
Dan Poltawski
849002fab9 Merge branch 'MDL-53044' of https://github.com/ak4t0sh/moodle 2016-12-19 08:47:21 +00:00
Dan Poltawski
8560d8e1f9 Merge branch 'MDL-55715_m33v1' of https://github.com/sbourget/moodle 2016-12-19 08:35:42 +00:00
John Okely
22c98e1e5a MDL-57268 auth_db: Unit tests for deletion from a large user set 2016-12-19 10:06:55 +08:00
Eloy Lafuente (stronk7)
17e14441c7 Merge branch 'wip-mdl-57344' of https://github.com/rajeshtaneja/moodle 2016-12-19 01:56:02 +01:00
Stephen Bourget
ef36d240c1 MDL-54996 Calendar: Fix dates for future multi-day events
Thanks to Martin Cunliffe for providing the fix
2016-12-17 09:48:41 -05:00
Mathew May
a446095f17 MDL-52098 enrol: cohort now looks at instance status 2016-12-16 11:18:52 +13:00
Arnaud Trouve
723a9dd9f4 MDL-53044 auth : force change on expired password 2016-12-15 14:49:03 +01:00
Dan Poltawski
d0e61e8655 MDL-57293 lang/email: Improve emailvia string
* Strip the https? part of url for existing strings
* Switch the string to (via shortname)
2016-12-15 09:54:04 +00:00
Andrew Nicols
5100c486bd weekly on-sync release 3.3dev 2016-12-15 11:34:52 +08:00
Andrew Nicols
703b6debe6 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-12-15 11:34:48 +08:00
Damyon Wiese
08d7c0e1ca MDL-57386 blocklib: wrong variable in is_block_present
This isn't reachable code in core moodle, but themes/plugins could call is_block_present to trigger it.
2016-12-15 10:50:44 +08:00
Tim Hunt
1a07d5ef82 MDL-57402 quiz editing: fix add heading after remove page break 2016-12-14 16:34:50 +00:00
AMOS bot
1f892bd05a Automatically generated installer lang files 2016-12-15 00:04:00 +08:00
Mark Nelson
c9431a5be8 MDL-57270 core_message: trim message before it is sent 2016-12-14 12:18:58 +08:00
Stephen Bourget
455835809d MDL-55715 calendar: Only update events from the current subscription
The iCal import should only update calendar events from the current
subscription not any subscription that contains the same event.
2016-12-13 21:36:08 -05:00
Andrew Nicols
374d7af2eb Merge branch 'wip-mdl-57380' of https://github.com/rajeshtaneja/moodle 2016-12-14 09:55:34 +08:00
Rajesh Taneja
b3a2a33f07
MDL-57380 behat: Check for list tags and text
after list tag span can be added on few browsers
like chrome 51.0, so test if text starts with
list tag and contains text
2016-12-14 09:37:35 +08:00
Andrew Nicols
428e18ed2b Merge branch 'MDL-55062_master' of git://github.com/markn86/moodle 2016-12-14 09:26:10 +08:00
Stephen Bourget
71cfa70a0e MDL-55568 chat: chat_refresh_events should only create published events 2016-12-13 18:52:33 -05:00
Eloy Lafuente (stronk7)
6296803878 Merge branch 'MDL-55809-master' of https://github.com/xow/moodle 2016-12-13 20:05:15 +01:00
Dan Poltawski
a7471c40b4 Merge branch 'MDL-57125-master' of git://github.com/lameze/moodle 2016-12-13 16:34:52 +00:00
Dan Poltawski
ae2bf1626c Merge branch 'MDL-56810_master' of https://github.com/Syxton/moodle 2016-12-13 14:55:50 +00:00
Eloy Lafuente (stronk7)
ab73c1ddbb Merge branch 'feature/MDL-56830' of https://github.com/fwsl/moodle 2016-12-13 12:00:46 +01:00
Henning Bostelmann
a2a1a58683 MDL-55575 mod_glossary: Allow viewing all entries on one page 2016-12-13 11:43:29 +01:00
Eloy Lafuente (stronk7)
bd31523a30 Merge branch 'MDL-55720' of https://github.com/ak4t0sh/moodle 2016-12-13 11:41:35 +01:00