5531 Commits

Author SHA1 Message Date
Andrew Nicols
6c99c1e777 Merge branch 'MDL-48621_master' of git://github.com/dmonllao/moodle 2016-01-19 15:47:12 +08:00
David Monllao
356e235459 MDL-48621 admin: Warning about events 1 API deprecation 2016-01-19 15:19:13 +08:00
Mark Nelson
806905b59b MDL-49291 core: final deprecation of sql_*_reader interfaces 2016-01-18 14:24:34 +08:00
Andrew Nicols
f731f9c6d9 Merge branch 'MDL-50829-master' of git://github.com/danpoltawski/moodle 2016-01-13 09:56:31 +08:00
Dan Poltawski
04a03ff282 Merge branch 'wip-MDL-50851-master' of git://github.com/marinaglancy/moodle 2016-01-12 14:17:14 +00:00
Dan Poltawski
b8ab80f07e Merge branch 'MDL-52210-master' of git://github.com/cameron1729/moodle 2016-01-12 13:36:13 +00:00
Cameron Ball
088d6086d8 MDL-21912 restore: Add admin setting to restore conflicting admin user 2016-01-11 14:08:58 +08:00
Marina Glancy
3da0c3cbf4 MDL-50851 tool_uploaduser: allow to set interests 2016-01-10 15:25:48 +08:00
Marina Glancy
54f63cd11b MDL-50851 tool_uploadcourse: allow to set tags 2016-01-10 15:25:48 +08:00
Cameron Ball
13ae7db2bb MDL-52210 webservices: Remove AMF webservice 2016-01-05 10:36:26 +08:00
Dan Poltawski
0a7051ff5a MDL-50829 lang: fix to RTL/LTR bracket confusion
Thanks to ISHIKAWA Takayuki for the initial patch
2015-12-29 12:30:18 +00:00
David Monllao
a4fb992435 Merge branch 'MDL-52335-master' of git://github.com/marinaglancy/moodle 2015-12-10 15:47:14 +08:00
David Monllao
1b42ef0e99 Merge branch 'MDL-52438-master' of git://github.com/marinaglancy/moodle 2015-12-10 15:31:29 +08:00
Marina Glancy
10eb44f7e6 MDL-52438 core: allow Moodle 3.0 to be used with PHP7 2015-12-08 12:54:32 +08:00
David Monllao
7e092a97d7 Merge branch 'MDL-52370-master' of git://github.com/danpoltawski/moodle 2015-12-07 15:01:42 +08:00
Dan Poltawski
0ad66dda0e Merge branch 'MDL-52292' of git://github.com/timhunt/moodle 2015-12-03 11:13:26 +01:00
Marina Glancy
83bef8dabb MDL-52335 tool_uploaduser: php7 compatibility in variable syntax 2015-12-03 09:31:25 +08:00
Tim Hunt
eb3884e48f 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:48:08 +00:00
Dan Poltawski
8f2c99d610 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:14 +00:00
Eloy Lafuente (stronk7)
e070165f57 Merge branch 'MDL-52219-master' of git://github.com/danpoltawski/moodle 2015-12-01 00:50:10 +01:00
Marina Glancy
49f3c89324 MDL-52332 calendar: load settings using API 2015-11-30 11:36:50 +08:00
Dan Poltawski
aa306e7bc8 MDL-52219 behat: remove steps which turn on avaibility/completion
Now its the default, we can reduce test time by relying on the default
state rather than going around turning it on
2015-11-26 14:07:17 +00:00
Dan Poltawski
e354bf1e67 MDL-52219 admin: Enable completion and restricted access by default 2015-11-26 14:07:17 +00:00
Eloy Lafuente (stronk7)
6d29c4acdd MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts 2015-11-17 17:08:56 +01:00
Eloy Lafuente (stronk7)
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
David Mudrák
8159f23e76 MDL-47979 blocks: Do not display link to legacy file admin/block.php
The deprecated file admin/block.php was removed in Moodle 2.6. Since
then, all blocks that declare has_config() must provide a settings.php
file.
2015-11-09 13:30:40 +01:00
Cameron Ball
4bb9e1ad8a MDL-51091 core_registration: session key check in registration. 2015-11-04 18:46:27 +08:00
Dan Poltawski
728754de6b Merge branch 'MDL-52018-master-enfix' of git://github.com/mudrd8mz/moodle 2015-11-03 17:56:21 +01:00
David Mudrák
e8b75e6292 MDL-52018 lang: Fix behat tests to use the new strings 2015-11-02 22:30:46 +01:00
Helen Foster
da6ecfd8c1 MDL-52018 lang: Merge English strings from the en_fix language pack 2015-11-02 22:12:06 +01:00
Eloy Lafuente (stronk7)
373748277a Merge branch 'MDL-51829-master' of git://github.com/dpalou/moodle 2015-11-02 19:40:16 +01:00
Dan Poltawski
28aadc2b12 Merge branch 'MDL-51128-master' of git://github.com/junpataleta/moodle 2015-11-02 14:07:10 +00:00
Andrew Nicols
fd424b99f2 MDL-51894 inboundmessage: Ensure that all mailboxes exist 2015-10-26 12:17:15 +08:00
Dani Palou
dbcade703b MDL-51829 admin: Set userquota setting as PARAM_INT 2015-10-20 10:01:11 +02:00
Andrew Nicols
84d5eef4ad Merge branch 'MDL-50412-master' of git://github.com/danpoltawski/moodle 2015-10-19 07:56:51 +08:00
Dan Poltawski
293197afb3 Merge branch 'MDL-49329-master-multiplug' of git://github.com/mudrd8mz/moodle 2015-10-16 14:53:26 +01:00
Andrew Nicols
690e23e69d Merge branch 'MDL-51651-master' of git://github.com/danpoltawski/moodle 2015-10-16 09:21:45 +08:00
Andrew Nicols
62bf94655e Merge branch 'MDL-50182' of git://github.com/stronk7/moodle 2015-10-16 08:07:04 +08:00
Dan Poltawski
6660fbb3d3 Merge branch 'MDL-51781_master' of git://github.com/markn86/moodle 2015-10-15 11:08:26 +01:00
Dan Poltawski
f655414669 MDL-51651 lang: add consitency for application of firstdayofweek
1) Set the site-wide default based on language pack
2) Use the site/user preference for js popups, like we do in /calendar/
2015-10-15 10:15:05 +01:00
Mark Nelson
f74fe5ba52 MDL-51781 tool_log: marked log values as NOT_MAPPED if mapping not found 2015-10-15 01:25:43 -07:00
Dan Poltawski
05ed945e61 Merge branch 'wip-mdl-50940' of https://github.com/rajeshtaneja/moodle 2015-10-15 08:58:23 +01:00
Damyon Wiese
bb6ca6f360 MDL-51260 tags: Update the tags form element to use the autocomplete field
AMOS BEGIN
    REM [interestslist_help,moodle] Commas are no longer required
    REM [entertags,tag] Commas are no longer required
    REM [othertags,tag] Commas are no longer required
AMOS END
2015-10-15 12:03:35 +08:00
David Monllao
ee58df52da Merge branch 'MDL-46455-master-20151012' of git://github.com/damyon/moodle 2015-10-13 11:42:40 +08:00
Jun Pataleta
cef93f97ae MDL-51128 course: Add startdate for generated course
Added course start date for the course generated by the course
generator in order to prevent incorrect date calculations
(i.e. in assignment due dates) when the generated course is reset.
2015-10-12 21:48:27 -05:00
Andrew Nicols
3648d7963a Merge branch 'MDL-51427-master' of git://github.com/marinaglancy/moodle 2015-10-13 10:13:43 +08:00
Eloy Lafuente (stronk7)
ca09f076f8 MDL-50182 core: add 3.0 environmental requirements
Only change from 2.9 is the modification of the slasharguments
admin setting string to recommend always to keep the setting enabled
and fix the problem in the server, warning about the drawbacks
of disabling it.

Also, there is a little phpdoc note added to one custom check
to have clearly specified when we can get rid of it.
2015-10-13 00:33:41 +02:00
Damyon Wiese
ac82a9a8b4 MDL-46455 Events: Add db mapping info even if not part of backup
We can return db mapping info even for objects that are not included
in backup/restore and it may be useful in future (no use in core yet).
2015-10-12 16:41:02 +08:00
Mark Nelson
607021c14b MDL-46455 events: added more mapping
Also fixed a few bugs.
2015-10-11 18:52:36 -07:00
Damyon Wiese
3d0fff3a83 MDL-46455 restore: Add debug messages when log records cannot be mapped 2015-10-11 18:14:59 -07:00