Eloy Lafuente (stronk7)
777361983c
Merge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle
2017-01-11 02:42:29 +01:00
Jun Pataleta
3adf4b1837
MDL-57149 admin: Make langimport page Bootstrap-compatible
...
* Create template for the language import page.
* Apply Bootstrap classes to form elements.
* Use core notifications for displaying error/success messages.
2017-01-10 10:24:17 +08:00
Dan Poltawski
7716be5ae8
Merge branch 'MDL-57563-master-enfix' of git://github.com/mudrd8mz/moodle
2017-01-05 10:09:17 +00:00
Helen Foster
442879042c
MDL-57563 lang: Merge English strings from the en_fix language pack
2017-01-04 22:03:08 +01:00
Dan Poltawski
b6f5e57e45
Merge branch 'MDL-57531-master-phpmailer' of git://github.com/mudrd8mz/moodle
2017-01-04 13:29:10 +00:00
David Mudrák
066ec13585
MDL-57531 mail: Do not let admins set invalid email addresses
...
The noreply and support emails should always be valid.
2017-01-04 12:34:29 +01:00
Dan Poltawski
c3e9e8bc3c
Merge branch 'MDL-57389-master' of git://github.com/jleyva/moodle
2017-01-04 11:33:58 +00:00
Rajesh Taneja
57bee542ab
MDL-56519 behat: Fixed lint errors
2017-01-03 09:12:54 +08:00
Juan Leyva
91fff3914b
MDL-57389 tool_mobile: Return mobilecssurl in get_public_config WS
2017-01-02 18:56:02 +01:00
David Monllao
cc31be4ffc
Merge branch 'MDL-57450-master' of git://github.com/danpoltawski/moodle
2016-12-28 11:45:34 +01:00
Dan Poltawski
83c7b312cd
Merge branch 'wip-MDL-57292-master' of git://github.com/abgreeve/moodle
2016-12-28 09:13:29 +00:00
Adrian Greeve
c496632681
MDL-57292 tool_lpimportcsv: Fix for unit tests.
2016-12-22 13:06:40 +08:00
Rajesh Taneja
ccb2a6a5f8
MDL-56581 behat: Use proper steps to navigate to Permissions
2016-12-21 12:51:17 +08:00
Jes Ackland-Snow
e985a29cdf
MDL-56581 Roles: Permissions override screen not inherited styling
2016-12-20 12:09:01 +00:00
Eloy Lafuente (stronk7)
863e1a66a9
Merge branch 'MDL-56547' of https://github.com/ak4t0sh/moodle
2016-12-20 12:47:54 +01:00
David Monllao
d17b70dda2
MDL-56320 tool_mobile: rest protocol dependency added
2016-12-19 15:11:00 +01:00
David Monllao
ef9a1a2aff
Merge branch 'MDL-56320-m' of https://github.com/micaherne/moodle
2016-12-19 15:05:14 +01:00
David Monllao
902b32bd1b
Merge branch 'MDL-56527-master' of git://github.com/mudrd8mz/moodle
2016-12-19 14:03:53 +01:00
Dan Poltawski
89556019c0
MDL-57450 enviroment: remove tls library check
...
Unfortunately it has come to light that the version sniffing is just not
reliable at all, operating system vendors backport security patches to
older versions - so in many cases we reporting a problem which is not a
problem. False positives and the solution to self-compile or something
like php will be causing more harm than good.
2016-12-19 10:55:07 +00:00
Simey Lameze
c4eb68177e
MDL-57292 tool_lpimportcsv: display progress bar for large imports
2016-12-16 10:47:01 +08:00
Arnaud Trouve
3009095bc9
MDL-56547 admin : add check on user deletion
...
Check if the target user is not already deleted
and print an explicit error in that case.
2016-12-15 14:29:07 +01:00
Andrew Nicols
428e18ed2b
Merge branch 'MDL-55062_master' of git://github.com/markn86/moodle
2016-12-14 09:26:10 +08:00
Eloy Lafuente (stronk7)
ab73c1ddbb
Merge branch 'feature/MDL-56830' of https://github.com/fwsl/moodle
2016-12-13 12:00:46 +01:00
Dan Poltawski
2956ca50fa
Merge branch 'MDL-57250_master' of git://github.com/markn86/moodle
2016-12-13 10:25:07 +00:00
Mark Nelson
f85800f305
MDL-55062 tool_uploaduser: prevent defaults when not selected
2016-12-13 12:34:42 +08:00
Dan Poltawski
1b846b8ed6
Merge branch 'MDL-57171-master-2' of git://github.com/junpataleta/moodle
2016-12-12 10:31:16 +00:00
David Mudrák
cb425a917f
MDL-56527 admin: Improve the error message if download is not available
...
The previous string did not actually contain a link where the lang pack
could be downloaded from.
2016-12-09 11:22:12 +01:00
Mark Nelson
f04dda1071
MDL-57250 core: show admin settings when only one category exists
2016-12-09 13:41:34 +08:00
Andrew Nicols
75af0aa680
Merge branch 'MDL-57266' of git://github.com/stronk7/moodle
2016-12-07 09:53:16 +08:00
Dan Poltawski
c4d9fd1afe
Merge branch 'MDL-53677-master' of git://github.com/ankitagarwal/moodle
2016-12-06 12:48:09 +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
SSRF
7829997343
MDL-53677 tool_spamcleaner: CSRF Fix
...
Resolves minor CSRF within Moodle spamcleaner.
2016-12-06 12:25:14 +05:30
Marina Glancy
7a12a02dc7
MDL-56614 behat: add navigation block when required
...
Most of these hacks have links to corresponding MDL issues
2016-12-06 11:49:14 +08:00
Marina Glancy
44f460c32a
MDL-56614 behat: rename step for navigating in the gradebook
2016-12-06 11:49:14 +08:00
Marina Glancy
e5287f9b3b
MDL-56614 behat: navigate without navigation and admin blocks
2016-12-06 11:49:14 +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
Dan Poltawski
1acd568793
MDL-56553 usertours: fix apostrophe use
2016-12-02 09:22:42 +00:00
David Monllao
b9278260c7
MDL-56553 usertours: Removing trailing ^M
2016-12-02 16:23:03 +08:00
Ryan Wyllie
1459415f93
MDL-56553 tool_usertours: change add a block step to position right
2016-12-02 07:53:07 +00:00
David Monllao
76e337ab96
Merge branch 'MDL-57232-master' of git://github.com/damyon/moodle
2016-12-02 14:20:17 +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
Jun Pataleta
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
Andrew Nicols
8f5de6f268
Merge branch 'MDL-56553-master-2' of git://github.com/ryanwyllie/moodle
2016-12-01 14:31:45 +08:00
Ryan Wyllie
10df630ee8
MDL-56553 tool_usertours: add admin and course tours
2016-12-01 00:44:29 +00:00
Ryan Wyllie
3eb3d916cb
MDL-56553 tool_usertours: allow tours to be shipped with Moodle
2016-12-01 00:36:02 +00:00
Dan Poltawski
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
Dan Poltawski
a9b85245f2
Merge branch 'MDL-52199-incoming-nice-fail' of https://github.com/brendanheywood/moodle
2016-11-30 09:52:35 +00: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
Dan Poltawski
1f5fbd1696
Merge branch 'wip-mdl-56659' of https://github.com/rajeshtaneja/moodle
2016-11-25 11:17:36 +00:00