Commit graph

1561 commits

Author SHA1 Message Date
David Monllao
1652309d02 Merge branch 'MDL-51109-master' of git://github.com/danpoltawski/moodle 2015-09-01 18:31:26 +08:00
Dan Poltawski
a6e9c23016 MDL-51109 task: more debug info for failed scheduled tasks 2015-09-01 10:59:55 +01:00
David Mudrák
033761fe9b MDL-48494 admin: Fail validation of plugins with no component declared 2015-08-31 10:01:34 +02:00
David Mudrák
f5f5a60ac9 MDL-43896 admin: Fail validation of plugins with $module in version.php 2015-08-31 09:57:50 +02:00
David Monllao
5d98022e81 Merge branch 'MDL-51084-master' of git://github.com/marinaglancy/moodle 2015-08-31 12:54:49 +08:00
Marina Glancy
bdead9b5c7 MDL-51084 tool_customlang: return to the same page after submit 2015-08-28 16:20:03 +08:00
David Mudrák
f729af1609 MDL-51148 tool_langimport: Use the amended string in Behat test 2015-08-26 17:03:36 +02:00
Helen Foster
ce2c0f3a74 MDL-51148 lang: Merge English strings from the en_fix language pack 2015-08-26 16:46:43 +02:00
David Monllao
9502083292 MDL-49280 auth: Rewording duplicate emails setting
From allowuserstoshareemailaddresses to allowaccountssameemail, also
changing lang strings.
2015-08-20 12:56:11 +08:00
Dan Poltawski
cfeadc66b0 Merge branch 'MDL-49280-m' of https://github.com/micaherne/moodle 2015-08-17 15:03:59 +01:00
David Monllao
fd76204a8b Merge branch 'MDL-51100-master' of git://github.com/andrewnicols/moodle 2015-08-17 08:50:49 +08:00
Andrew Nicols
711b1d6b3e MDL-51100 behat: Remove javascript tag from usermenu steps
These tests only needed the javascript tag because of the user menu.
Now that issue has been resolved, they do not need it.

Note: Some were also not using the singleselect feature, so would fail
without changes to use this too as they were not handling proper selection
of the singleselect element.
2015-08-14 08:52:29 +08:00
Marina Glancy
7f0c7f01c0 MDL-51062 behat: permission steps should work without js 2015-08-09 20:33:27 +08:00
Michael Aherne
bc9837241f MDL-49280 user: Config for allowing duplicate emails 2015-08-04 08:46:08 +01:00
Lauri Koskela
e225a665ff MDL-50762 tool_capability: Do not hide first capability in list 2015-07-17 15:28:37 +03:00
Eloy Lafuente (stronk7)
b164e2ec30 Merge branch 'MDL-50049-master' of git://github.com/ankitagarwal/moodle 2015-07-09 20:24:13 +02:00
Dan Poltawski
6bf2e10e0a MDL-50466 logstore: bump version to load new task definitions 2015-07-07 15:09:28 +01:00
Dan Poltawski
fae47ac284 Merge branch 'MDL-50466-m' of https://github.com/micaherne/moodle 2015-07-07 09:36:50 +01:00
Dan Poltawski
559c0f09bd MDL-39319 langimport: fix language file ordering and trailing whitespace 2015-07-01 11:06:33 +02:00
Dan Poltawski
56420e3664 Merge branch 'MDL-39319-master' of git://github.com/mastnym/moodle 2015-07-01 11:04:37 +02:00
Ankit Agarwal
2149326b8c MDL-50049 deprecation: Remove usage of deprecated api and cleanup 2015-06-29 17:15:50 +05:30
Michael Aherne
8daf8d87f2 MDL-50466 tasks: Specific minute values for log cleanup 2015-06-29 08:45:04 +01:00
David Monllao
5c73688b4a MDL-50408 tool_log: Extra deprecation tip
Adding a debugging message and returning alternative data to keep backwards
compatibility as get_readers is a widely used function.
2015-06-08 15:56:23 +08:00
Dan Poltawski
5ffb982d25 Merge branch 'MDL-49707-master' of git://github.com/ankitagarwal/moodle 2015-06-01 10:09:06 +01:00
Ankit Agarwal
2639cdf0b0 MDL-49707 inbound: localpart should be < 15 2015-06-01 10:06:16 +05:30
Martin Mastny
96a2e00d42 MDL-39319 langimport: Javascript confirmation when uninstalling 2015-05-29 13:08:33 +08:00
Martin Mastny
6ddf92c774 MDL-39319 langimport: Able to delete more languages at once 2015-05-29 13:08:33 +08:00
Eloy Lafuente (stronk7)
777cb3ece8 Merge branch 'wip-mdl-49772' of https://github.com/rajeshtaneja/moodle 2015-05-26 18:48:03 +02:00
Rajesh Taneja
91a96d402a MDL-49772 behat: Added support to updatestep file by parallel run 2015-05-21 13:24:29 +08:00
Eloy Lafuente (stronk7)
b758ab3053 MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts 2015-05-12 00:21:05 +02:00
Adrian Greeve
a19c4b8dd0 MDL-50039 tool_monitor: Behat update to fix selection error 2015-05-07 13:13:04 +08:00
Adrian Greeve
0f510be763 MDL-50039 tool_monitor: Additional checks for subscription.
Additional capability checks are now in place to stop unauthorised
users from accessing the event monitor subscription page.

Thanks to Eloy Lafuente for creating a gist with ideas of tackling
No site level capability to the rule subscription.
2015-05-07 13:13:04 +08:00
Dan Poltawski
57fc76ab92 Merge branch 'MDL-50102' of git://github.com/stronk7/moodle 2015-05-06 10:50:35 +01:00
Damyon Wiese
917bd02be5 MDL-49870 tool_templatelibrary: Allow docs in parent template only.
If the mustache comment containing the docs for the template is
not found in the theme overridden template, search the original
core/plugin template for the docs.
2015-05-06 14:54:56 +08:00
Eloy Lafuente (stronk7)
26ea380d24 MDL-50102 versions: bump all versions and requires near release
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
2015-05-05 17:43:19 +02:00
Damyon Wiese
410034eef0 MDL-50085 templates: Minor fixes from peer review
* rename get_filename to get_filepath
* phpdocs fixes
* improve formatting of exceptions
* lang string improvement
2015-05-05 03:19:39 +02:00
Damyon Wiese
fcc383db0f MDL-50085 Mustache : Strictly define the search paths for templates.
This change moves several repeated sections of code that was searching
for templates and valid template locations to a new class. It adds
unit tests for the new class and verifies subsystem support for templates.
2015-05-05 03:19:25 +02:00
David Monllao
9996e8954b Merge branch 'wip-MDL-49846-master-fix' of git://github.com/abgreeve/moodle 2015-05-04 14:57:18 +08:00
David Monllao
3994812f38 Merge branch 'wip-mdl-50042' of git://github.com/rajeshtaneja/moodle 2015-05-04 14:16:09 +08:00
Adrian Greeve
bdf899a503 MDL-49846 tool_monitor: Context simplification and clean up.
Removed some unnecessary variables and simplified the context
usage in the index.php page.
2015-05-04 14:05:44 +08:00
Andrew Nicols
6e9abef568 Merge branch 'MDL-49983-master' of git://github.com/xow/moodle 2015-05-04 12:39:48 +08:00
John Okely
4887d15228 MDL-49983 navigation: Remove 'my' from user context navigation 2015-05-04 12:38:50 +08:00
Adrian Greeve
19452c99d7 MDL-49846 tool_monitor: Subscription page now filters on site events. 2015-05-04 12:29:54 +08:00
David Monllao
600596fd6a Merge branch 'MDL-49840-master' of git://github.com/andrewnicols/moodle 2015-05-01 11:05:59 +08:00
Rajesh Taneja
7fb84d75ee MDL-50042 behat: Use double quotes to avoid symfony adding it 2015-04-30 16:42:11 +08:00
Frederic Massart
e14388e3a7 MDL-49972 preferences: Fix incorrect title and headings 2015-04-23 16:05:00 +08:00
Andrew Nicols
6866527275 MDL-40811 uploaduser: Optimise testuser code 2015-04-21 11:34:00 +08:00
Andrew Nicols
7464939f6d Merge branch 'MDL-40881_master' of https://github.com/nadavkav/moodle 2015-04-21 11:17:16 +08:00
Rajesh Taneja
0fe86bbdbb MDL-49799 behat: replaced asd.com with example.com
asd.com is a valid domain, we should use reserved domain names for testing
2015-04-20 11:21:20 +08:00
Rajesh Taneja
f8b71928d2 MDL-49456 behat: Use proper dir separator to support different os 2015-04-17 11:48:37 +08:00