43b3cf0f25
MDL-57245 behat: Use correct @_file_upload tag
2016-12-02 19:04:32 +08:00
dadbe55c81
Merge branch 'MDL-57193-master-notest' of git://github.com/FMCorz/moodle
2016-12-02 11:41:02 +01:00
1acd568793
MDL-56553 usertours: fix apostrophe use
2016-12-02 09:22:42 +00:00
7fc7486f49
MDL-57193 auth_db: Flip the array outside the loop for better perf
...
Also as the recent changes where affecting the whitespaces quite
a lot, I took the liberty of aligning a few lines which weren't.
2016-12-02 16:29:47 +08:00
ec3e79134f
MDL-57193 auth_db: Use a recordset and array_key_exists
2016-12-02 16:29:47 +08:00
34949c1a55
MDL-57193 auth_db: Fixed bug suspends all users if external DB has > 10k
2016-12-02 16:29:47 +08:00
b9278260c7
MDL-56553 usertours: Removing trailing ^M
2016-12-02 16:23:03 +08:00
1459415f93
MDL-56553 tool_usertours: change add a block step to position right
2016-12-02 07:53:07 +00:00
76e337ab96
Merge branch 'MDL-57232-master' of git://github.com/damyon/moodle
2016-12-02 14:20:17 +08:00
80ee8a3eb0
Merge branch 'MDL-57209-master' of git://github.com/crmpicco/moodle
2016-12-02 13:26:56 +08:00
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
666b9fcb6a
MDL-57243 search: Correct todo doc
2016-12-02 10:53:52 +08:00
ddcb68b284
Merge branch 'MDL-57243_master' of git://github.com/dmonllao/moodle
2016-12-02 10:49:34 +08:00
5f654ea2c0
MDL-57243 search: Note about search area base classes relocation
2016-12-02 09:51:05 +08:00
d8326d8364
MDL-57101 media_videojs: Load legacy events before use
2016-12-02 08:58:19 +08:00
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
f200f74552
Merge branch 'wip-MDL-57234-master' of https://github.com/Beedell/moodle
2016-12-01 17:58:51 +01:00
6c45e525fc
MDL-57234 Quiz report: fix exception in Responses for all users
2016-12-01 16:23:18 +00:00
5920f6338d
MDL-57171 admin: Make environment check table look better
...
* Use Bootstrap label classes for the text under the status column.
* theme_bootstrapbase:
- Cleanup unnecessary classes and make .error styles consistent
with .warn styles
* theme_boost:
- Set font color appropriate for success, warning and error strings.
* Enclose report text in div so that the feedback texts will be
displayed right below it.
2016-12-01 22:55:10 +08:00
063d5c28cf
Merge branch 'MDL-57220-master' of git://github.com/damyon/moodle
2016-12-01 13:20:15 +00:00
a8bac97613
Merge branch 'MDL-57194-master' of git://github.com/lameze/moodle
2016-12-01 12:20:01 +00:00
2b114798b9
Merge branch 'MDL-57210-master' of git://github.com/ryanwyllie/moodle
2016-12-01 16:12:25 +08:00
53cbfac2b9
Merge branch 'MDL-57101-master-fixup' of https://github.com/FMCorz/moodle
2016-12-01 15:07:42 +08:00
b52c562a8c
MDL-57101 media_videojs: Dynamic loader works on self-matching nodes
2016-12-01 14:51:40 +08:00
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
39a9ac4098
MDL-57101 core_media: Only instantiate enabled plugins
2016-12-01 14:50:04 +08:00
7d17256a75
MDL-57194 core_charts: Allow colors to be overridden by setting
2016-12-01 14:44:00 +08:00
8f5de6f268
Merge branch 'MDL-56553-master-2' of git://github.com/ryanwyllie/moodle
2016-12-01 14:31:45 +08:00
1f16e4e68e
Merge branch 'MDL-57219-master' of git://github.com/damyon/moodle
2016-12-01 13:30:23 +08:00
995c6d2787
Merge branch 'MDL-57206-master' of https://github.com/snake/moodle
2016-12-01 12:21:25 +08:00
bb8b3ba6f8
Merge branch 'wip-mdl-57229' of https://github.com/rajeshtaneja/moodle
2016-12-01 11:38:59 +08:00
04bfccdce6
MDL-57229 enrol: Enrol dialog should have relative position
...
On clean theme it is absolute position and on small
screen user can't scroll to enrol user
2016-12-01 11:13:46 +08:00
3cc12bd747
MDL-57210 theme_boost: fix header buttons on smaller resolutions
2016-12-01 02:21:25 +00:00
e7d0de87c9
MDL-57219 blocks: Dont create and empty block for spacing
...
Change box to an empty container. We are after tiny tiny changes ATM.
2016-12-01 10:12:29 +08:00
ef06bc18b0
MDL-57220 boost: Fix for date selector inline template
...
It was putting the label on a separate line.
2016-12-01 09:48:59 +08:00
52ee200368
MDL-57220 boost: minimal fix for radio button template
...
It still does not match
http://v4-alpha.getbootstrap.com/components/forms/#radios
but I don't want to make radical changes before 3.2 release.
2016-12-01 09:48:06 +08:00
10df630ee8
MDL-56553 tool_usertours: add admin and course tours
2016-12-01 00:44:29 +00:00
3eb3d916cb
MDL-56553 tool_usertours: allow tours to be shipped with Moodle
2016-12-01 00:36:02 +00:00
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
d27e1c7519
MDL-56893 grades: Fix edit grade item when grade_report_showmin is false
...
Check to make sure $data['grademin'] exists. When grade_report_showmin
is false $data['grademin'] doesn't exist.
2016-11-30 11:57:57 -07:00
5544189dd1
Automatically generated installer lang files
2016-12-01 00:05:38 +08:00
09ade73632
Merge branch 'master' into install_master
2016-12-01 00:05:38 +08:00
ce7149b10c
MDL-57197 js: fix AMD module warnings
...
In 3.2 we are free of AMD lint warnings, unfortunately we can't expose
them through grunt yet due to
"File ignored because of a matching ignore pattern. Use "--no-ignore" to
override"
ps. this isn't related to MDL-57197 at all, i'm just a Rebel
2016-11-30 13:50:38 +00:00
5814817ceb
Merge branch 'MDL-57169_master' of git://github.com/markn86/moodle
2016-11-30 11:04:38 +00:00
a9b85245f2
Merge branch 'MDL-52199-incoming-nice-fail' of https://github.com/brendanheywood/moodle
2016-11-30 09:52:35 +00:00
10461a04c6
Merge branch 'MDL-57207-master' of git://github.com/cameron1729/moodle
2016-11-30 09:51:21 +00:00
9a22c99ea9
MDL-57207 mod_lti: Remove redundant popover() call
...
Since MDL-56748 popovers are properly delegated. Making manual calls
to .popover redundant.
2016-11-30 17:45:41 +08:00
b95107ca83
Merge branch 'MDL-57205-master' of git://github.com/damyon/moodle
2016-11-30 15:03:43 +08:00
432ed35484
Merge branch 'MDL-57127-master' of git://github.com/FMCorz/moodle
2016-11-30 14:27:23 +08:00
f4aec377fc
Merge branch 'MDL-56682_master' of git://github.com/markn86/moodle
2016-11-30 13:56:08 +08:00
Rajesh Taneja