Dan Poltawski
ee1f658207
Merge branch 'MDL-57283_master' of git://github.com/markn86/moodle
2016-12-07 10:16:54 +00:00
Dan Poltawski
eec60baeca
Merge branch 'MDL-56674-master' of https://github.com/kenneth-hendricks/moodle
2016-12-07 08:45:16 +00:00
Marina Glancy
c0ad000f46
MDL-56614 behat: corrections to new steps
2016-12-07 13:37:49 +08:00
Andrew Nicols
4b2bcd2376
Merge branch 'wip-mdl-56353' of https://github.com/rajeshtaneja/moodle
2016-12-07 11:53:34 +08:00
Rajesh Taneja
451ae0cabc
MDL-56353 behat: Added test for multi select dependency
2016-12-07 11:30:46 +08:00
Adrian Greeve
d8ecf9754e
MDL-57299 Atto: Theme boost fix for manage files.
...
Theme boost removed a selector that was being used
to remove used files and so the page wasn't loading
properly.
2016-12-07 10:40:39 +08:00
Andrew Nicols
e4621f0775
Merge branch 'wip-MDL-56642-master' of git://github.com/marinaglancy/moodle
2016-12-07 10:00:30 +08:00
Andrew Nicols
75af0aa680
Merge branch 'MDL-57266' of git://github.com/stronk7/moodle
2016-12-07 09:53:16 +08:00
Marina Glancy
1491f21554
MDL-56642 dataformat: set temp dir
...
Thanks to Chien Wen-Chang for proposing a patch
2016-12-07 09:30:14 +08:00
Dan Poltawski
369382f7bf
Merge branch 'MDL-56233-32-mocksubmit' of https://github.com/roperto/moodle
2016-12-06 12:42:00 +00:00
Dan Poltawski
7cdc6974d4
Merge branch 'MDL-56971-m' of https://github.com/micaherne/moodle
2016-12-06 11:08:08 +00:00
Grzegorz Ziółek
3118ff6f41
MDL-56830 config_log: Add block plugin visibility changes to config_log.
2016-12-06 11:29:02 +01:00
Andrew Nicols
3bb4ad7521
Merge branch 'MDL-57137_question_category_with_parent_category' of https://github.com/melihovv/moodle
2016-12-06 14:52:32 +08:00
Mark Nelson
07af06df96
MDL-57283 core: fixed function call on null
2016-12-06 14:12:42 +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
Michael Aherne
23b9e2a16d
MDL-56320 webservice: Allow uninstall of unused plugins
2016-12-05 12:56:55 +00:00
Daniel Thee Roperto
518eb19337
MDL-56233 forms library: Fixed form identifier when mocking a form.
...
If the plugin is using namespaces instead of frankenstyle class name,
get_called_class() will return 'type\name' instead of 'type_name'.
Added code to replace backslashes to underscores and fix that issue.
2016-12-05 11:27:05 +11:00
Rajesh Taneja
54348ea6d7
MDL-57232 behat: Add blocks in boost theme
...
Currently behat in boost depend on blocks
so make sure we have them.
2016-12-02 22:48:13 +08:00
David Monllao
76e337ab96
Merge branch 'MDL-57232-master' of git://github.com/damyon/moodle
2016-12-02 14:20:17 +08:00
David Monllao
80ee8a3eb0
Merge branch 'MDL-57209-master' of git://github.com/crmpicco/moodle
2016-12-02 13:26:56 +08:00
Damyon Wiese
9d1402abd8
MDL-57232 blocks: Split undeletableblocktypes
...
There are 2 kinds of blocks that are undeletable. Those required by the
theme and those protected via the admin page ui. We only want the theme
ones to be auto created site wide if they don't exist - so we need to
rename the theme ones and split the logic.
2016-12-02 12:32:03 +08:00
Andrew Nicols
666b9fcb6a
MDL-57243 search: Correct todo doc
2016-12-02 10:53:52 +08:00
Andrew Nicols
ddcb68b284
Merge branch 'MDL-57243_master' of git://github.com/dmonllao/moodle
2016-12-02 10:49:34 +08:00
David Monllao
5f654ea2c0
MDL-57243 search: Note about search area base classes relocation
2016-12-02 09:51:05 +08:00
Luke Carrier
6f62abab2c
MDL-57143 dml: sqlsrv drivers are going xplat \o/
...
They're now available on PECL:
https://pecl.php.net/package/sqlsrv
And the source for the extension is on GitHub:
https://github.com/Microsoft/msphpsql
Note that they do require installation of unixODBC; relevant
documentation is available for Debian- and RHEL-likes:
* https://www.microsoft.com/en-us/sql-server/developer-get-started/php-ubuntu
* https://www.microsoft.com/en-us/sql-server/developer-get-started/php-rhel
2016-12-01 22:08:57 +00:00
Dan Poltawski
a8bac97613
Merge branch 'MDL-57194-master' of git://github.com/lameze/moodle
2016-12-01 12:20:01 +00:00
Frederic Massart
36e6789b27
MDL-57101 filter: Load globally available filters on every page
...
Previous commits were overlooked, they should have passed the
system context to filter_manager::setup_page_for_fitlers(), the
page context was passed instead. Regardless, the processing of
the latter is too excessive for what we need, but, more importantly,
it does not return "Off, but available" filters which we also need.
2016-12-01 14:51:40 +08:00
Simey Lameze
7d17256a75
MDL-57194 core_charts: Allow colors to be overridden by setting
2016-12-01 14:44:00 +08:00
Andrew Nicols
995c6d2787
Merge branch 'MDL-57206-master' of https://github.com/snake/moodle
2016-12-01 12:21:25 +08:00
Jake Dallimore
bb316e0764
MDL-57206 core: describe newly introduced hooks in upgrade.txt
...
Added a description and example for the
<component>_course_module_background_deletion_recommended hook.
2016-12-01 08:25:28 +08:00
Andrew Nicols
b95107ca83
Merge branch 'MDL-57205-master' of git://github.com/damyon/moodle
2016-11-30 15:03:43 +08:00
Andrew Nicols
432ed35484
Merge branch 'MDL-57127-master' of git://github.com/FMCorz/moodle
2016-11-30 14:27:23 +08:00
David Monllao
99d2667f5c
Merge branch 'MDL-57072-master' of git://github.com/junpataleta/moodle
2016-11-30 13:36:32 +08:00
Craig R Morton
f6f0cb49aa
MDL-57209 forms: Notice: Undefined index: options in profile edit page
...
Skipping a loop iteration if the option group has no options.
2016-11-30 13:08:56 +08:00
Frederic Massart
061a39ac5d
MDL-57127 output: Increase memory limit when parsing CSS
2016-11-30 12:19:03 +08:00
Andrew Nicols
3f342da584
Merge branch 'MDL-57101-master-2nd' of git://github.com/FMCorz/moodle
2016-11-30 12:13:54 +08:00
David Monllao
4495ddcf9f
Merge branch 'MDL-56955-master' of git://github.com/lameze/moodle
2016-11-30 11:34:29 +08:00
Simey Lameze
45cd101f80
MDL-56955 theme_boost: fix login failure displaying on user menu
2016-11-30 11:32:38 +08:00
Damyon Wiese
7c0725857a
MDL-57205 forms: Prevent debugging in selectgroups
...
Sometimes the option group has no options I guess. The same check is in
exportValue.
2016-11-30 10:38:51 +08:00
Jun Pataleta
8ace7b6c34
MDL-57072 theme_boost: Render action menu for category management
2016-11-30 09:11:32 +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
Frederic Massart
e37c128686
MDL-57101 filter: Always set-up the page for filters
2016-11-29 12:36:28 +08:00
Andrew Nicols
805659e1fa
Merge branch 'MDL-56919-master' of git://github.com/junpataleta/moodle
2016-11-29 12:06:56 +08:00
Andrew Nicols
740dbe77a2
Merge branch 'MDL-56858_master-alt-2' of git://github.com/markn86/moodle
2016-11-29 11:52:32 +08:00
David Monllao
8b516a6a55
Merge branch 'MDL-57163_master' of git://github.com/dmonllao/moodle
2016-11-29 11:46:55 +08:00
David Monllao
4a1165ba39
MDL-57163 install: Check curl availability before curl_version()
2016-11-29 11:46:06 +08:00
Mark Nelson
dc801cb6b9
MDL-56858 theme_boost: separate input description and label
...
Also added missing advanced and required form symbols.
2016-11-28 18:24:16 +08:00
Dan Poltawski
1cbc346092
Merge branch 'MDL-57176-master' of git://github.com/damyon/moodle
2016-11-28 08:30:37 +00:00