Dan Poltawski
6e45cfc0c0
Merge branch 'MDL-58593-master' of git://github.com/merrill-oakland/moodle
2017-04-17 10:03:07 +01:00
Eric Merrill
cd729dc905
MDL-58593 database: More efficiently track issued key names
2017-04-13 12:21:13 -04:00
David Monllao
d0d0a7b482
Merge branch 'MDL-58560-master' of https://github.com/xow/moodle
2017-04-13 11:38:37 +02:00
Andrew Nicols
20026ab3c1
Merge branch 'MDL-58356-master' of git://github.com/damyon/moodle
2017-04-13 12:10:45 +08:00
Andrew Nicols
270d5c1cc5
Merge branch 'MDL-46929' of https://github.com/andrewhancox/moodle
2017-04-13 10:00:58 +08:00
Andrew Nicols
28b966a5f9
Merge branch 'MDL-39913-master-new-validation' of https://github.com/xow/moodle
2017-04-13 08:44:15 +08:00
David Monllao
ebebbb307b
Merge branch 'MDL-58555' of https://github.com/timhunt/moodle
2017-04-12 14:08:27 +02:00
Ankit Agarwal
f712568c1f
MDL-57573 phpmailer: Update to version 5.2.23
2017-04-12 14:06:18 +02:00
Andrew Hancox
e9c46768b5
MDL-46929 mod_forum: Fix for edge cases when searching
2017-04-11 08:30:09 +01:00
Andrew Hancox
d2ba493cfe
MDL-46929 mod_forum: Implement tagging
2017-04-11 08:30:09 +01:00
Jake Dallimore
c89eba308a
Merge branch 'MDL-58563-master' of git://github.com/junpataleta/moodle
2017-04-11 15:09:27 +08:00
Jun Pataleta
d3679c37af
MDL-58563 group: Specify table alias in sort parameter for group test
2017-04-11 12:40:41 +08:00
Damyon Wiese
c698b85ae8
MDL-58560 icons: Better mapping for t/move
2017-04-11 10:56:27 +08:00
Jake Dallimore
84fb93a77e
Merge branch 'MDL-58297-master' of git://github.com/andrewnicols/moodle
2017-04-11 10:49:07 +08:00
Jun Pataleta
f59c43a0fa
Merge branch 'MDL-58400-master' of git://github.com/junpataleta/moodle
2017-04-11 09:14:12 +08:00
Andrew Nicols
18baa6c956
Merge branch 'MDL-57290_master' of https://github.com/nadavkav/moodle
2017-04-11 08:43:36 +08:00
Tim Hunt
c1ac8e7fbf
MDL-58555 ajax: make ajax web service log entries more useful
...
It is not used for anything, but we put the method name(s) being called in the URL.
2017-04-10 16:29:16 +01:00
David Monllao
696bfb490b
Merge branch 'mdl-58489' of https://github.com/Dagefoerde/moodle
2017-04-10 16:55:46 +02:00
David Monllao
538dbf37e1
Merge branch 'MDL-58492-master-famarkers' of git://github.com/mudrd8mz/moodle
2017-04-10 11:10:04 +02:00
Nadav Kavalerchik
85b0d4a9cb
MDL-57290 Theme: Narrow admin page "menu" columns, in Boost & Clean
2017-04-10 10:09:03 +03:00
Andrew Nicols
137ea0572d
Merge branch 'wip-MDL-58180-master' of git://github.com/marinaglancy/moodle
2017-04-10 13:37:06 +08:00
Andrew Nicols
17cc2842a7
Merge branch 'MDL-58359-master' of git://github.com/damyon/moodle
2017-04-10 13:35:36 +08:00
Jun Pataleta
9be24e45b7
Merge branch 'MDL-58357-master' of git://github.com/damyon/moodle
2017-04-10 13:26:21 +08:00
Andrew Nicols
3afd529013
Merge branch 'MDL-57393-master' of git://github.com/jleyva/moodle
2017-04-10 13:20:13 +08:00
Jake Dallimore
cea0492924
Merge branch 'MDL-58543' of git://github.com/stronk7/moodle
2017-04-10 12:36:56 +08:00
Andrew Nicols
3de074e4bf
Merge branch 'MDL-58311_master' of https://github.com/sk-unikent/moodle
2017-04-10 12:00:59 +08:00
Andrew Nicols
1adae85448
Merge branch 'wip-mdl-58068' of https://github.com/rajeshtaneja/moodle
2017-04-10 11:54:09 +08:00
Damyon Wiese
d84b7f7f5c
MDL-58359 icons: Revert the icons for completion
...
We are missing one for "auto-completion not yet completed" etc.
2017-04-10 11:47:08 +08:00
Damyon Wiese
1a10c79f67
MDL-58356 icons: Revert file type icons
2017-04-10 11:36:51 +08:00
Jun Pataleta
627ea5b10e
MDL-58400 auth: New helper methods for identity providers
...
* get_identity_providers(): Retrieves available auth identity providers
* prepare_identity_providers_for_output(): Prepares auth identity
provider data for output (e.g. to templates, WS, etc)
* Use these helpers for the login renderer
2017-04-10 11:12:03 +08:00
Eloy Lafuente (stronk7)
2f090f4619
MDL-58543 upgrade: Replay 4 steps missed for some combinations
...
Moved 4 steps (2017033100.01-04) that were introduced after master
version was 2017040300 and were not executed always.
They have been moved to 2017040700.01-04, just on top of current
weekly (2017040700.00), so they will be executed by everybody.
As far as the 4 fields are XMLDB ones they are executed conditionally
so it's safe to replay them (for people that already had them run).
2017-04-09 14:11:20 +02:00
David Mudrák
f7cfa26ec4
MDL-58492 icons: Fix fontawesome for i/marker and i/marked icons
...
These combo icons are used to mark something the current element. They
are supposed to be used in places like the course outline to
mark/highlight a section as the current one. Also workshop uses them to
switch to a phase (mark it as the current one).
2017-04-07 14:35:16 +02:00
Luca Bösch
9955d65e5c
MDL-58180 lib: Role name pass format_text.
...
In function stats_get_report_options, the role names are returned after
having been processed through format_text which lets the filters work on them.
Signed-off-by: Luca Bösch <luca.boesch@bfh.ch>
2017-04-07 16:09:25 +08:00
Jonathon Fowler
4e5a22df7a
MDL-39913 filetypes: mimetypes remediation
...
Going by http://www.iana.org/assignments/media-types/media-types.xhtml .
Disambiguated the Office 2007 types, Apple iWorks and other types
changes by tonyjbutler.
2017-04-07 16:02:00 +08:00
Jan Dageförde
eb4ab7c4b8
MDL-58489 core: Fix unreachable HTTP error handling
2017-04-07 09:50:15 +02:00
Jun Pataleta
7e4a4d30df
NOBUG: Fixed file access permissions
2017-04-07 12:45:45 +08:00
Andrew Nicols
e6a4780452
MDL-58297 core: Update to use new hashing functions
2017-04-07 10:40:23 +08:00
Andrew Nicols
a30a04fa01
MDL-58297 filestorage: New functions for hash calculation
2017-04-07 10:40:23 +08:00
Simey Lameze
daef59826a
MDL-55611 core_tests: replace remaining I follow coursename steps
2017-04-06 15:22:15 +08:00
Dan Poltawski
5f5f71ea62
Merge branch 'MDL-57411-master' of git://github.com/jleyva/moodle
2017-04-05 12:44:03 +01:00
Juan Leyva
8c60d198c2
MDL-57411 groups: Fix tests for MSSQL
2017-04-05 13:17:46 +02:00
Andrew Nicols
c46ae2fbc1
Merge branch 'MDL-58361-master' of https://github.com/xow/moodle
2017-04-05 15:04:44 +08:00
Andrew Nicols
941cb7ce3c
Merge branch 'MDL-58399-master' of git://github.com/jleyva/moodle
2017-04-05 14:22:39 +08:00
Mark Nelson
90b735b169
MDL-12689 core: fixed incorrect use of the term 'depreciated'
2017-04-05 11:12:07 +08:00
Jake Dallimore
170a8b3ec4
Merge branch 'MDL-58368-master' of git://github.com/damyon/moodle
2017-04-05 09:33:45 +08:00
Eloy Lafuente (stronk7)
aa2b5b214d
Merge branch 'wip-MDL-57769-master' of https://github.com/marinaglancy/moodle
2017-04-05 01:31:08 +02:00
Eloy Lafuente (stronk7)
4c9919fb15
Merge branch 'MDL-55326-master' of git://github.com/andrewnicols/moodle
2017-04-04 19:01:57 +02:00
Dan Poltawski
67aaf4eeda
MDL-55611 upgrade.txt: remove duplicated note
2017-04-04 17:32:13 +01:00
Dan Poltawski
6ebb0947f0
MDL-55611 upgrade: bump redirect_if_major_update_required
2017-04-04 17:08:35 +01:00
Dan Poltawski
1e4e5c52d7
Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle
2017-04-04 17:07:41 +01:00
