18991 Commits

Author SHA1 Message Date
Adrian Greeve
4112ef994a MDL-40356 lib: Unit tests for the alternativefullnameformat setting. 2014-09-09 09:23:19 +08:00
Adrian Greeve
ea6f548081 MDL-40356 lib: Added a new setting to display more information from the fullname function. 2014-09-09 09:22:43 +08:00
Marina Glancy
3b4db5bdf5 MDL-44725 dml: added sql_intersect() 2014-09-03 13:33:58 +08:00
sam marshall
002ccdcf49 MDL-44725 Add Behat support for setting grouping condition (14)
Makes it possible to add a grouping condition when creating an
activity, using the Behat field type API. You can set the field
using a syntax 'Grouping: NAME' (at present, only groupings are
supported, obviously we could potentially extend this to add
support for other conditions if needed).

Tested in Firefox and Chrome in JS mode, and in non-JS mode.
2014-09-02 13:03:35 +01:00
sam marshall
61c3b60c03 MDL-44725 Update cm_info::create to allow 'false' param (13)
Currently cm_info::create allows the 'null' parameter, and
returns null (as a null $cm should still be null when treated
as a cm_info object).

Some unit tests relied on the value 'false' being treated
the same as null in this regard. This seems like a generally
safe assumption (given this is a function about changing
weakly typed data into a stronger type) so I modified the
function to accept anything PHP false, returning null.
2014-09-02 13:03:33 +01:00
sam marshall
9c85baa8c5 MDL-44725 Availability: Replace groupmembersonly - FEATURE_xx (6)
Remove old FEATURE_GROUPMEMBERSONLY as no longer required.
2014-09-02 13:03:17 +01:00
sam marshall
48c79eb3e9 MDL-44725 Availability: Replace groupmembersonly - login (5)
Remove groupmembersonly option from require_login.

NOTE: This code, and another branch (both related to login when
accessing activities on the site course), are not actually
necessary because there is code above which already checks
$cm->uservisible.

NOTE: You can see this change more simply by doing
git diff --ignore-space-change; indent was altered.
2014-09-02 13:03:15 +01:00
sam marshall
061e6b2864 MDL-44725 Availability: Replace groupmembersonly - upgrade, core (1)
* Upgrades existing data so that the groupmembersonly option is
  replaced with equivalent data for the new availability API.
* Removes the database field and admin setting used for
  groupmembersonly.
* Changes core modinfo library to remove/deprecate groupmembersonly
  data and functions.
* Changes other core library files to remove groupmembersonly
  references.

Includes deprecation of several functions, listed in lib/upgrade.txt.
2014-09-02 13:03:07 +01:00
Eloy Lafuente (stronk7)
f034d6d113 Merge branch 'MDL-43639_updatePassEveryLogin' of https://github.com/moodlerooms/moodle 2014-09-02 01:07:36 +02:00
Damyon Wiese
37b0059539 Merge branch 'wip-MDL-46540-master' of git://github.com/marinaglancy/moodle 2014-09-01 16:08:19 +08:00
Marina Glancy
6bb1f0bf4c MDL-46540 stats: missing include file
Thanks to Vadim Dvorovenko for finding a bug and providing a solution
2014-09-18 03:40:54 +08:00
Marina Glancy
d0a9fa02e4 Merge branch 'MDL-46861' of https://github.com/Lightwork-Marking/moodle 2014-09-01 16:06:22 +08:00
Matteo Scaramuccia
cfa5bd1f3f MDL-46985 Added 7-Zip and RAR MIME types. 2014-08-31 22:33:28 +02:00
Paul Charsley
352f3f4797 MDL-46861 added missing required field areaname 2014-08-29 09:42:54 +12:00
Eloy Lafuente (stronk7)
934a22a333 Merge branch 'm28_MDL-46875' of https://github.com/totara/moodle 2014-08-27 01:41:58 +02:00
Damyon Wiese
6d9a83c294 Revert "Merge branch 'MDL-46917-master' of git://github.com/andrewnicols/moodle"
This reverts commit acbcea51013bdf5d0101dc5856d8aca97bf1c036, reversing
changes made to 91f31c097dd46674d8535096e020ffa42536e854.
2014-08-26 17:18:03 +08:00
Damyon Wiese
112632ed58 Merge branch 'wip_MDL-46235_m28_innodbtext' of https://github.com/skodak/moodle 2014-08-26 12:28:47 +08:00
Damyon Wiese
a564a66efa Merge branch 'MDL-46509' of https://github.com/danielneis/moodle 2014-08-26 11:45:43 +08:00
Brian Barnes
24af352b40 MDL-46875 tinymce: Fixed issue with full screen and spelling 2014-08-26 13:19:43 +12:00
Damyon Wiese
acbcea5101 Merge branch 'MDL-46917-master' of git://github.com/andrewnicols/moodle 2014-08-25 16:54:47 +08:00
Damyon Wiese
a88770d7eb Merge branch 'MDL-46923_master' of git://github.com/markn86/moodle 2014-08-25 16:48:27 +08:00
Damyon Wiese
4da7f20610 Merge branch 'wip_MDL-43918_m28_cm' of https://github.com/skodak/moodle 2014-08-25 16:45:15 +08:00
Marina Glancy
cf2d4159b7 Merge branch 'MDL-46191-master' of git://github.com/FMCorz/moodle 2014-08-25 15:43:29 +08:00
Frederic Massart
07f827acd4 MDL-46191 gradereport_history: Final clean up for integration 2014-08-25 14:53:28 +08:00
Marina Glancy
241d1d42cf Merge branch 'MDL-46904-master' of git://github.com/damyon/moodle 2014-08-25 14:45:05 +08:00
Petr Skoda
a45d54b8cb MDL-46235 ddl: add support for large number of text fields in one database table 2014-08-25 12:40:57 +12:00
Petr Skoda
b6f299bb69 MDL-43918 add more validation to $modulename parameter when fetching cms 2014-08-25 12:09:54 +12:00
Andrew Nicols
1b8f073de3 MDL-46917 atto: Focus on the editor when the form label is selected 2014-08-22 08:58:21 +08:00
Daniel Neis Araujo
b5a289c4e8 MDL-46509 enrol: Require 'enrol/PLUGIN:config' capabilities to show/hide enrollment instances 2014-08-21 19:01:57 -03:00
Eloy Lafuente (stronk7)
52953ff948 MDL-46918 ddl: cover behavior with unit test 2014-08-21 18:33:23 +01:00
Tim Hunt
5dc266d980 MDL-46918 ddl: fix error when renaming table already exists 2014-08-21 18:33:22 +01:00
Mark Nelson
08678f6f45 MDL-46923 core_behat: fixed typos in function names 2014-08-20 22:09:29 -07:00
Marina Glancy
ea1a0ff85a NOBUG: Fixed file access permissions 2014-08-21 10:18:37 +08:00
Damyon Wiese
a0ac406055 MDL-46904 core_task: Gracefully handle rubbish entries in the tasks table. 2014-08-20 17:01:15 +08:00
uhunkler
6dccf359a0 MDL-46302 correct atto img float right
Correct the atto image "float right" margin CSS
2014-08-20 00:59:31 +02:00
Marina Glancy
376a6f687c Merge branch 'wip-mdl-46327' of git://github.com/rajeshtaneja/moodle 2014-08-19 17:28:55 +08:00
Rajesh Taneja
a9950b49c4 MDL-46327 phpunit: drop_table should be used, rather then drop_temp_table 2014-08-19 17:16:55 +08:00
Damyon Wiese
52ed065131 Merge branch 'MDL-46706-master' of https://github.com/sammarshallou/moodle
Conflicts:
	lib/tests/modinfolib_test.php
2014-08-19 17:13:05 +08:00
Damyon Wiese
aba9019832 Merge branch 'wip_MDL-46711_m28_memcachesrvs' of https://github.com/skodak/moodle 2014-08-19 16:31:06 +08:00
Damyon Wiese
fc9b567f32 Merge branch 'MDL-46772-master' of git://github.com/andrewnicols/moodle 2014-08-19 15:41:32 +08:00
Marina Glancy
7e4475d37c Merge branch 'MDL-46833-master' of git://github.com/lucisgit/moodle 2014-08-19 14:20:41 +08:00
Marina Glancy
2c0ee558e5 Merge branch 'wip-mdl-46817' of git://github.com/rajeshtaneja/moodle 2014-08-19 14:03:27 +08:00
Marina Glancy
430529bde8 Merge branch 'MDL-18014-master' of git://github.com/damyon/moodle 2014-08-19 13:50:44 +08:00
Damyon Wiese
9eea856632 MDL-18014 Atto autosave: Add a timemodified field to the auto save drafts
Do not restore any draft older than 4 days to (sort of) sync with the draft file
lifetime.
2014-08-19 12:30:13 +08:00
Damyon Wiese
942501f318 MDL-18014 Atto autosave: When text is recovered, force it into the undo stack
This allows you to use "Undo" to go back to the unaltered text in the form.
2014-08-19 12:13:41 +08:00
Marina Glancy
b3194ab1b2 Merge branch 'master_MDL-46775' of git://github.com/totara/moodle 2014-08-19 11:21:22 +08:00
Marina Glancy
3377a87d69 Merge branch 'wip-mdl-46327' of git://github.com/rajeshtaneja/moodle 2014-08-19 10:48:11 +08:00
Rajesh Taneja
c1dc3f4793 MDL-46327 phpunit: Fixed oracle fail 2014-08-19 10:11:20 +08:00
Eloy Lafuente (stronk7)
652d886ae5 Merge branch 'wip_MDL-46552_m28_memcached' of https://github.com/skodak/moodle 2014-08-19 02:28:56 +02:00
Eloy Lafuente (stronk7)
6ea7fde09c Merge branch 'MDL-45874' of https://github.com/danielneis/moodle 2014-08-18 23:58:27 +02:00