Eloy Lafuente (stronk7)
717845b52d
Merge branch 'MDL-54833-master-workshopuserplan' of git://github.com/mudrd8mz/moodle
2016-10-25 20:46:30 +02:00
Eloy Lafuente (stronk7)
0d80f6984b
Merge branch 'MDL-56250-32-formvalidation' of https://github.com/roperto/moodle
2016-10-25 20:23:12 +02:00
Eloy Lafuente (stronk7)
f07a1ae8a3
Merge branch 'master' of https://github.com/yuriy-os/moodle
2016-10-25 20:11:27 +02:00
Dan Poltawski
607bdc3829
Merge branch 'MDL-53366-master' of https://github.com/lucisgit/moodle
2016-10-25 19:05:00 +01:00
Dan Poltawski
d5e902d3ab
Merge branch 'MDL-55143' of https://github.com/mr-russ/moodle
2016-10-25 18:40:06 +01:00
Eloy Lafuente (stronk7)
c52cc59877
Merge branch 'MDL-54781_master' of git://github.com/markn86/moodle
2016-10-25 19:37:11 +02:00
Eloy Lafuente (stronk7)
bab82353f6
Merge branch 'MDL-56444' of https://github.com/mr-russ/moodle
2016-10-25 18:56:00 +02:00
Dan Poltawski
98363b9d52
MDL-56017 filter_mathjax: bump version
2016-10-25 10:38:03 +01:00
Dan Poltawski
64ce747448
Merge branch 'MDL-56017-master' of git://github.com/lameze/moodle
2016-10-25 10:36:51 +01:00
David Monllao
26aa08b2f8
Merge branch 'MDL-56307-master' of git://github.com/jleyva/moodle
2016-10-25 17:33:08 +08:00
Dan Poltawski
274c5837e7
Merge branch 'MDL-56536-master' of git://github.com/jleyva/moodle
2016-10-25 10:12:54 +01:00
Juan Leyva
25adfbaa4a
MDL-56307 course: Support new returned data in WS
2016-10-25 10:10:55 +01:00
Juan Leyva
65b2669d98
MDL-56307 course: Return time updated and times updated
2016-10-25 10:10:55 +01:00
Russell Smith
cebce76f61
MDL-56307 course: Refactor file_storage
2016-10-25 10:10:53 +01:00
Juan Leyva
26659f626a
MDL-56307 course: New Web Service core_course_check_module_updates
2016-10-25 10:10:53 +01:00
Juan Leyva
02a73d767c
MDL-56307 course: New course_check_module_updates_since method
2016-10-25 10:10:52 +01:00
Juan Leyva
1896b8009a
MDL-56307 course: API changes to support retrieve by time
2016-10-25 10:10:52 +01:00
Dan Poltawski
ad07960d89
Merge branch 'wip-MDL-56395-master' of https://github.com/Beedell/moodle
2016-10-25 09:30:46 +01:00
Dan Poltawski
b580f39556
Merge branch 'MDL-56403_master' of git://github.com/markn86/moodle
2016-10-25 09:27:42 +01:00
Dan Poltawski
737e3c3b67
Merge branch 'MDL-56487-master' of git://github.com/andrewnicols/moodle
2016-10-25 08:42:58 +01:00
David Monllao
ab9ca549e7
Merge branch 'wip-mdl-56347' of https://github.com/rajeshtaneja/moodle
2016-10-25 15:20:06 +08:00
Andrew Nicols
9c792b9861
Merge branch 'MDL-55922' of https://github.com/mr-russ/moodle
2016-10-25 15:11:43 +08:00
Dan Poltawski
c435523ac5
Merge branch 'MDL-56468-master' of git://github.com/andrewnicols/moodle
2016-10-25 08:11:05 +01:00
David Monllao
bf91437d25
Merge branch 'wip-mdl-55074' of https://github.com/rajeshtaneja/moodle
2016-10-25 15:09:24 +08:00
David Monllao
1d58c301c7
Merge branch 'MDL-56156-master' of git://github.com/damyon/moodle
2016-10-25 15:05:17 +08:00
Andrew Nicols
b146ff9451
MDL-56004 theme_bootstrapbase: Rebuild less
2016-10-25 14:24:32 +08:00
Andrew Nicols
2979c25683
Merge branch 'MDL-56004-master' of https://github.com/damyon/moodle
2016-10-25 14:13:19 +08:00
David Monllao
5c39800880
Merge branch 'wip-mdl-53048' of https://github.com/rajeshtaneja/moodle
2016-10-25 14:00:29 +08:00
Dan Poltawski
3b89ce210d
Merge branch 'MDL-56442-master' of https://github.com/StudiUM/moodle
2016-10-25 06:56:44 +01:00
Rajesh Taneja
c99dffb69c
MDL-55074 behat: Fixed new theme related changes
2016-10-25 13:48:51 +08:00
Dan Poltawski
0579372b70
Merge branch 'MDL-56552_master' of git://github.com/dmonllao/moodle
2016-10-25 06:45:15 +01:00
Dan Poltawski
1a2497c3c2
Merge branch 'MDL-55902-master' of git://github.com/junpataleta/moodle
2016-10-25 06:38:13 +01:00
Damyon Wiese
fb045b4e15
MDL-56004 theme: upgrade.txt note about bootstrap compatibility
2016-10-25 13:36:29 +08:00
Damyon Wiese
0862719092
MDL-56004 theme: Add some BS2 compatibility to BS4.
...
This is for user-created texts (e.g. the people have used the generico filter to inject BS2 markup into user tests).
It is also for existing old HTML that we have not had time to upgrade yet.
2016-10-25 13:36:23 +08:00
Damyon Wiese
fe4a6c3bdb
MDL-56004 theme: Add some BS4 compatibility to BS2
2016-10-25 13:36:18 +08:00
David Monllao
1e56070d34
Merge branch 'wip-mdl-55981' of https://github.com/rajeshtaneja/moodle
2016-10-25 13:29:03 +08:00
Rajesh Taneja
39946dc135
MDL-53048 behat: Fixed unmasked password field to select
2016-10-25 13:23:36 +08:00
Rajesh Taneja
cdb4975a44
MDL-55981 behat: Fixed groups seen by user
2016-10-25 13:19:32 +08:00
Dan Poltawski
76a6dc685d
Merge branch 'MDL-56534-master' of git://github.com/crazyserver/moodle
2016-10-25 06:08:48 +01:00
David Monllao
f5b07540c7
Merge branch 'MDL-56532-master' of git://github.com/andrewnicols/moodle
2016-10-25 12:43:36 +08:00
David Monllao
0add237ef5
Merge branch 'MDL-56516-master' of git://github.com/andrewnicols/moodle
2016-10-25 12:37:44 +08:00
Andrew Nicols
14d9b4fd85
MDL-56532 tool_usertours: Correct langstring uses for top/bottom
2016-10-25 12:15:34 +08:00
David Monllao
74965e29f6
Merge branch 'MDL-56006-master' of git://github.com/damyon/moodle
2016-10-25 11:51:21 +08:00
Rajesh Taneja
d87dac7e70
MDL-56006 behat: Load proper context by helper
2016-10-25 11:21:53 +08:00
Andrew Nicols
85f33abf3e
Merge branch 'MDL-56015-master' of git://github.com/damyon/moodle
2016-10-25 10:37:36 +08:00
Damyon Wiese
848db61636
MDL-56006 blocks: Fix installation with no required blocks
...
Boost requires no blocks which was causing a failure on installation.
2016-10-25 10:15:20 +08:00
Rajesh Taneja
4422ffc55e
MDL-56006 behat: Get proper feature and context for default theme
...
No matter which theme is default theme, overridden
context and blacklisted features should be respected
2016-10-25 10:15:20 +08:00
Damyon Wiese
e56b58e3c9
MDL-56006 theme: Set Boost as the default theme
...
Units tests have been adjusted e.g. 'boost' instead of 'clean' in pix urls.
Some places I didn't update the test to reflect the boost markup and reset
the theme to clean. This is because the test was not testing the markup - but the
functionality (e.g. looking for specific structures to indicate an error in a form element).
2016-10-25 10:15:20 +08:00
Damyon Wiese
976b635d7b
MDL-56015 theme_boost: Clean up pix folder
...
Add real screenshot of new theme and delete unused images and icons.
2016-10-25 10:09:07 +08:00
Andrew Nicols
6db92c6c37
MDL-56516 tool_usertous: Remove eroneous test
2016-10-25 08:54:33 +08:00
