80849 Commits

Author SHA1 Message Date
Dan Poltawski
53843cc18d MDL-56423 boostrap: fix eranously removed css 2016-10-13 10:01:30 +01:00
David Monllao
beb505fab1 Merge branch 'wip-mdl-56299-fix' of https://github.com/rajeshtaneja/moodle 2016-10-13 10:51:12 +08:00
Rajesh Taneja
2761e0d604
MDL-56299 behat: Popover doesn't work with phantomjs 2016-10-13 10:47:32 +08:00
David Monllao
f5e8a744bf Merge branch 'wip-mdl-56087' of https://github.com/rajeshtaneja/moodle 2016-10-13 10:18:20 +08:00
Rajesh Taneja
deb71a0032
MDL-56087 behat: Fixed no messages string 2016-10-13 09:57:53 +08:00
Rajesh Taneja
664a2a2900
MDL-55522 behat: Commented failing transformations
- Reverted the order of transformations in order they are expected
- Commented failing transformation steps - MDL-56397
They should be fixed by https://github.com/Behat/Behat/issues/959
2016-10-13 09:41:15 +08:00
Dan Poltawski
f6b8aec404 Merge branch 'MDL-54682_master-fix-alt' of https://github.com/markn86/moodle 2016-10-12 15:21:02 +01:00
Dan Poltawski
17ab49e9b1 Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle 2016-10-12 14:53:01 +01:00
Mark Nelson
2127ca2cde MDL-54682 core_message: do not disable left panel when deleting messages 2016-10-12 21:45:33 +08:00
Tony Butler
88d309d947 MDL-56324 assignfeedback_editpdf: Use correct page in save_current_page 2016-10-12 14:17:48 +01:00
Dan Poltawski
d68472984a Merge branch 'MDL-56384_master' of https://github.com/markn86/moodle 2016-10-12 09:26:26 +01:00
David Monllao
6beb7a780c Merge branch 'MDL-56095-master-fix' of git://github.com/cameron1729/moodle 2016-10-12 15:17:37 +08:00
Mark Nelson
d29be93807 MDL-56384 message_popup: fixed oracle PHPUnit failures 2016-10-12 15:14:30 +08:00
Cameron Ball
00d3a8c5f4
MDL-56095 output: Properly set prototype on custom event for IE 2016-10-12 13:10:30 +08:00
Rajesh Taneja
cd5e416560
MDL-27072 behat: Removed wrong tag from feature 2016-10-12 12:57:22 +08:00
David Monllao
0115782157 Merge branch 'wip-mdl-27072' of git://github.com/rajeshtaneja/moodle 2016-10-12 11:29:59 +08:00
Rajesh Taneja
c76e57aace
MDL-27072 behat: Fixed table separators 2016-10-12 11:05:07 +08:00
David Monllao
bc8a896208 MDL-55393 message: Missing latest blocker issue code updates 2016-10-12 10:45:34 +08:00
Juan Leyva
67d76e2fe2 MDL-55393 message: New WS get_user_notification_preferences 2016-10-12 09:43:16 +08:00
Juan Leyva
311f5e4025 MDL-55393 message: Add some external functions to mobile service 2016-10-12 09:41:59 +08:00
Eloy Lafuente (stronk7)
2660c96098 Merge branch 'MDL-56319-m' of https://github.com/micaherne/moodle 2016-10-11 20:24:13 +02:00
Eloy Lafuente (stronk7)
d5bc94628c Merge branch 'wip-mdl-55522' of https://github.com/rajeshtaneja/moodle 2016-10-11 20:13:04 +02:00
Dan Poltawski
287a906645 Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle 2016-10-11 17:35:07 +01:00
Eloy Lafuente (stronk7)
a34625a17c Merge branch 'MDL-55345' of https://github.com/paulholden/moodle 2016-10-11 17:06:17 +02:00
Dan Poltawski
412a4a6d8b MDL-54682 message: fix eslint issues 2016-10-11 13:29:56 +01:00
Dan Poltawski
34930e37cd MDL-54682 deprecatedlib: fix trailing whitespace 2016-10-11 13:17:42 +01:00
Dan Poltawski
c8303131be Merge branch 'MDL-54682_master' of git://github.com/markn86/moodle 2016-10-11 12:53:11 +01:00
Eloy Lafuente (stronk7)
1e1dbc669f Merge branch 'MDL-56147-master' of git://github.com/FMCorz/moodle 2016-10-11 12:49:56 +02:00
Eloy Lafuente (stronk7)
77348a62db Merge branch 'MDL-55954_master' of git://github.com/dmonllao/moodle 2016-10-11 12:46:32 +02:00
Eloy Lafuente (stronk7)
44e7b8b827 Merge branch 'wip-mdl-56248' of https://github.com/rajeshtaneja/moodle 2016-10-11 12:15:05 +02:00
David Monllao
85d7a13ab0 Merge branch 'master_MDL-51401' of https://github.com/janeklb/moodle 2016-10-11 17:58:05 +08:00
Eloy Lafuente (stronk7)
537054ec27 Merge branch 'MDL-55921' of https://github.com/mr-russ/moodle 2016-10-11 11:54:23 +02:00
David Monllao
b65c33ace5 Merge branch 'MDL-52051-master' of git://github.com/andrewnicols/moodle 2016-10-11 17:11:21 +08:00
Dan Poltawski
988ff9f57f Merge branch 'MDL-36611-master' of git://github.com/junpataleta/moodle 2016-10-11 08:53:06 +01:00
Mark Nelson
d4b2c195e1 MDL-54682 core: build amd modules 2016-10-11 14:39:24 +08:00
Mark Nelson
16f91ae12a MDL-56299 core: fixed failing Behat tests
This also involved removing legacy Behat tests.
2016-10-11 14:39:24 +08:00
Ryan Wyllie
6b5d0e976a MDL-56087 message: change conversations to messages 2016-10-11 14:39:24 +08:00
Ryan Wyllie
f54a16fc73 MDL-56274 message: unlock tabs and search after delete all 2016-10-11 14:39:24 +08:00
Mark Nelson
fd9a64a302 MDL-56336 core_message: fix WS exception when 'forcepasswordchange' set 2016-10-11 14:39:24 +08:00
Ryan Wyllie
963ba88970 MDL-56234 message: fix messaging UI in theme boost 2016-10-11 14:39:24 +08:00
Ryan Wyllie
641b36e2ab MDL-56292 message: move notifications page into popup plugin 2016-10-11 14:39:23 +08:00
Ryan Wyllie
9f7b7b7c88 MDL-56292 message: fix style for notification popover and page 2016-10-11 14:39:23 +08:00
Ryan Wyllie
14617a566b MDL-56292 message: mustache template docs 2016-10-11 14:39:23 +08:00
Ryan Wyllie
8b99e16358 MDL-56292 core: add note to upgrade.txt for context_header change 2016-10-11 14:39:23 +08:00
Ryan Wyllie
7d69958e6b MDL-56292 message: move popover code into output plugin 2016-10-11 14:39:23 +08:00
Ryan Wyllie
f8e4145feb MDL-56292 core: change size of 'component' DB column 2016-10-11 14:39:22 +08:00
Andrew Nicols
066963cd18 MDL-52051 repository_dropbox: Migrate to v2 API 2016-10-11 11:17:09 +08:00
Kirill Astashov
f3ced08622 MDL-36611 outcome: Set page context when editing outcome 2016-10-11 10:01:01 +08:00
Eloy Lafuente (stronk7)
db43b23848 Merge branch 'wip-MDL-27072-master' of https://github.com/Beedell/moodle 2016-10-11 02:42:02 +02:00
Eloy Lafuente (stronk7)
dcd5c7cd1b Merge branch 'MDL-56228-master' of https://github.com/snake/moodle 2016-10-11 02:02:23 +02:00