69af79848a
MDL-53431 tool_monitor: Access control for tool monitor subscriptions
2016-07-05 10:46:04 +08:00
d4a279464e
Merge branch 'MDL-55041_30_STABLE' of https://github.com/marxjohnson/moodle into MOODLE_30_STABLE
2016-07-04 12:45:58 +01:00
74526688a0
MDL-55041 roles: Fix JSON parsing in permission manager
2016-07-01 15:00:36 +01:00
f4adac3f9a
MDL-53019 environment: 3.2 requirements added
...
Changes:
- PHP 5.6.5 required
2016-07-01 13:50:02 +02:00
723702bf08
MDL-54974 behat: Handle interupts on PHP7
...
As https://bugs.php.net/bug.php?id=71448 is
not going to get fixed, we need to declare tick
2016-06-27 14:32:54 +08:00
3a435c4deb
Merge branch 'MDL-51505-30' of git://github.com/FMCorz/moodle into MOODLE_30_STABLE
2016-06-21 10:31:04 +08:00
69b9974f91
MDL-53788 multilangupgrade: fix aggressive course cache rebuilding
2016-06-15 10:50:15 +10:00
09bfb22703
MDL-51505 tool_templatelibrary: Prevent jumping when selecting template
2016-06-13 17:07:49 +08:00
b1c2c0f474
MDL-54010 roles: Specify encoding for escaped export data
2016-05-26 10:32:09 +08:00
86100ea6c0
MDL-54010 roles: Fix missing HTMLspecialchars in role export code.
...
Role name and description fields are currently not escaped when
exporting a role. This results in an unusable file when characters
such as ampersands are used in a name or description. Fix this by
using htmlspecialchars on both fields.
Signed-off-by: Nigel Cunningham <nigelc@catalyst-au.net >
2016-05-26 10:32:09 +08:00
1ffadaf625
Merge branch 'MDL-52708-30_STABLE' of https://github.com/ramdesh/moodle into MOODLE_30_STABLE
2016-05-09 15:52:30 +08:00
3fecbbe510
MDL-53928 environment: add xmlreader requirement for 3.1
2016-04-24 01:34:38 +02:00
0fd01700f4
Merge branch 'MDL-53795-30' of git://github.com/merrill-oakland/moodle into MOODLE_30_STABLE
2016-04-19 01:46:17 +02:00
b906a29e50
MDL-52708 core_admin: Added Behat test to automate MDLQA-8190
2016-04-15 00:07:36 +05:30
e9024a1443
MDL-53795 logging: Add DB index for use when backing up logs
2016-04-12 22:26:35 -04:00
6238007754
MDL-53674 event monitor: Do not send HTML as plain text formatted emails
...
There were two problems here.
* The $msgdata->fullmessage was always formatted as HTML even if the
$msgdata->fullmessageformat was set to the original template's format.
* The plain text part of the emailed message contained HTML code.
The patch makes sure that the original template is always formatted into
HTML and then converted to plain text before setting the text/plain
multipart of the sent email.
2016-04-08 15:13:39 +02:00
f7e66c022e
MDL-52502 behat: Ensure php web and cli version is same
2016-04-05 11:47:32 +08:00
2f416e9f87
Merge branch 'wip-mdl-49150-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE
2016-03-30 00:10:59 +02:00
92b0b88db1
Merge branch 'MDL-53356-30' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE
2016-03-29 15:57:16 +08:00
5948df3878
Merge branch 'wip-mdl-53434-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE
2016-03-29 14:23:53 +08:00
c0eeb8c461
MDL-53356 admin: Fixed erroneous sectionerror when upgrade is needed
2016-03-23 16:26:59 +08:00
28e7877645
Merge branch 'MDL-53547_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE
2016-03-22 22:58:41 +01:00
01bacdae55
MDL-53547 logstore_database: better DB driver handling in unit test
2016-03-22 06:45:51 +00:00
f825607286
MDL-49150 behat: Removed unnecessary @javascript tags
2016-03-22 13:55:22 +08:00
6db1bfacee
MDL-53262 inboundmessage: Fix inconsistent confirm From vs email body
2016-03-20 15:53:19 +11:00
158a5fe613
Merge branch 'MDL-53139-30' of https://github.com/dg711/moodle into MOODLE_30_STABLE
2016-03-16 00:19:02 +01:00
2941895cda
Merge branch 'MDL-53234-support-email-MOODLE_30_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_30_STABLE
2016-03-15 13:43:51 +08:00
41fc0ff97e
MDL-53434 behat: Improved exit status of parallel run
...
Exit status should contain pass/fail information
of each run it is executing. Every bit of status
will have information of pass/fail status of parallel
process
2016-03-11 21:13:38 +08:00
440f668464
MDL-53434 behat: Added support for $CFG->behat_profiles
...
This config will be supported to avoid broken configuration
in future. As this is limited, we need will still use
->behat_config to set config values which can't be set by
behat_profiles
2016-03-11 21:13:25 +08:00
8b91709968
MDL-53139 admin: case diff issue with email
2016-03-11 16:32:06 +05:30
406a0efd37
MDL-51167 tool_monitor: fix too strict condition & minor cleanup
2016-03-10 00:06:52 +01:00
73e281cdc4
MDL-53234 admin: Fixed wrong default support email bug
2016-03-09 20:57:10 +11:00
5dbd593d3a
Merge branch 'MDL-53010-30' of git://github.com/lameze/moodle into MOODLE_30_STABLE
2016-03-08 14:34:53 +08:00
6e036a74b0
Merge branch 'MDL-52984_30' of https://github.com/rushi963/moodle into MOODLE_30_STABLE
2016-03-08 14:04:27 +08:00
475362630b
MDL-51167 tool_monitor: check course visibility and user capabilities
2016-03-08 03:09:04 +01:00
477cad6875
MDL-53010 core_role: add missing coursecatlib include
2016-03-01 10:22:03 +08:00
b18af92a44
MDL-52984 Roles : Logs store newly created role's id
2016-02-29 15:01:07 +05:30
23cd87285b
MDL-51580 environment: 3.1 requirements added
...
Only important change is that Moodle 2.7 installed is
required to be able to upgrade to 3.1. See the issue
for opinions, votes and agreed outcomes.
2016-02-11 16:09:00 +01:00
a24477c30a
Merge branch 'MDL-50829-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE
2016-01-13 09:57:33 +08:00
6ab7e0d283
MDL-21912 restore: Add admin setting to restore conflicting admin user
2016-01-11 14:09:30 +08:00
92236e4345
MDL-50829 lang: fix to RTL/LTR bracket confusion
...
Thanks to ISHIKAWA Takayuki for the initial patch
2015-12-29 12:32:15 +00:00
9887a4cbae
Merge branch 'MDL-52335-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE
2015-12-10 15:48:28 +08:00
7d8fb1962e
Merge branch 'MDL-52438-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE
2015-12-10 15:32:43 +08:00
75b13bba36
MDL-52438 core: allow Moodle 3.0 to be used with PHP7
2015-12-08 12:54:54 +08:00
e662941230
Merge branch 'MDL-52370-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE
2015-12-07 15:02:03 +08:00
f3d159dea1
MDL-52335 tool_uploaduser: php7 compatibility in variable syntax
2015-12-03 09:33:24 +08:00
7cac3f6fe9
MDL-52292 block testing generators: improve the API
...
* Refactor the block generator base class, to remove the amount
of duplication required in base classes.
* Change the defaults that are filled in to be a little more natural.
* Make the Behat step 'Given the following "block" exist:' work.
2015-12-01 13:49:24 +00:00
db198f615a
MDL-52370 role: purge coursecontacts when role is edited
...
This is perhaps a bit more brutal purge than you'd like, but it only
affects coursecat role edits.
2015-12-01 13:14:55 +00:00
4e342f5397
MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts
2015-11-17 17:11:15 +01:00
2e144835bb
MDL-52059 versions: bump all versions and requires near release
...
version = planned 2015111600 release version
requires= current 2015111000 rc3 version
2015-11-10 12:33:52 +01:00
Jake Dallimore