69628 Commits

Author SHA1 Message Date
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
Eloy Lafuente (stronk7)
457f818026 weekly release 2.8dev 2014-09-04 19:54:47 +02:00
Eloy Lafuente (stronk7)
2728bb0919 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-09-04 19:54:36 +02:00
sam marshall
28f31f7d2d MDL-44725 Availability: Unit test for tree::get_user_list_sql 2014-09-04 10:25:01 +08:00
Eloy Lafuente (stronk7)
4191191735 Merge branch 'MDL-47031-master-enfix' of git://github.com/mudrd8mz/moodle 2014-09-03 19:25:38 +02:00
Marina Glancy
1f20801c35 Merge branch 'master_MDL-46639' of git://github.com/danmarsden/moodle 2014-09-03 16:58:25 +08:00
Dan Marsden
46e990a4ef MDL-46639 SCORM: incorrect setting of launch param, it is done in scorm_parse_aicc 2014-09-03 20:18:55 +12:00
Helen Foster
9447cdc206 MDL-47031 Merge English strings from the en_fix language pack 2014-09-03 10:02:56 +02:00
Marina Glancy
3b4db5bdf5 MDL-44725 dml: added sql_intersect() 2014-09-03 13:33:58 +08:00
Eloy Lafuente (stronk7)
5a249b20c4 Merge branch 'wip-MDL-30414-master' of https://github.com/mackensen/moodle 2014-09-03 01:08:17 +02:00
Eloy Lafuente (stronk7)
9bdb64681f Merge branch 'MDL-39929' of https://github.com/bostelm/moodle 2014-09-03 00:13:53 +02:00
sam marshall
78f753acea MDL-44725 Availability: Replace groupmembersonly - feedback (16)
There is one point where it restricted the list of users. I have
fixed this and also altered the (only) script that calls that function
so that it obtains a cm_info $cm rather than the old sort.

There were previously no Behat tests at all in this module. In order
to be confident that I didn't break it, I have implemented a Behat
test (which should also be useful in general as it does go through
other pages on the way to get to the relevant one).
2014-09-02 20:54:35 +08:00
Marina Glancy
ed2ecd3e35 MDL-44725 workshop: correct module generation in unittests (15) 2014-09-02 13:03:37 +01: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
45ab2d9ab6 MDL-44725 Availability: Replace groupmembersonly - workshop (12)
The availability restrictions that apply to user lists (group, grouping)
now apply in workshop:

* In user lists.
* When randomly allocating users (also now works as expected if you use
  group mode and a grouping with the activity).
2014-09-02 13:03:31 +01:00
sam marshall
1a7049af22 MDL-44725 Availability: Add SQL feature for user lists (11)
The previous API included a facility to filter a list of users
to include only those who are allowed to access an activity, i.e.
only people who belong to the required groups etc.

This change adds a new API function to return SQL that obtains
this list of users, so that it can be combined with other
queries.
2014-09-02 13:03:29 +01:00
sam marshall
c13ac85db8 MDL-44725 Availability: Replace groupmembersonly - assign (10)
Updated code to restrict list of users. Also includes changes to
ensure that a cm_info object is available (required for availability
checks).

There is a tweak to upgradelib to reflect the different fields used.
(Note that upgradelib is not used during upgrade, but only when
converting assignments from the old assignment module.)
2014-09-02 13:03:27 +01:00
sam marshall
c234c34085 MDL-44725 Availability: Replace groupmembersonly - quiz overrides (9)
This only affects the quiz overrides form, as groupmembersonly was
not used elsewhere. The change simply restricts the list of users
shown when selecting somebody for overrides.

Some additional code is needed to (efficiently) load the $cm object
as a cm_info so that the availability API can be used on it.
2014-09-02 13:03:23 +01:00
sam marshall
914027baf8 MDL-44725 Availability: Replace groupmembersonly - glossary (8)
No change to actual module, only unit tests.
2014-09-02 13:03:21 +01:00
sam marshall
f9103882dc MDL-44725 Availability: Add utility API to make unit testing easier (7)
Previously there was no way in PHP to create the JSON values used for
availability, except by manually hard-coding them (the main code to
do this normally is in JavaScript).

This makes unit tests hard to read, so I have implemented static
functions tree::get_root_json and tree::get_nested_json which allow
for easier-to-read unit tests.
2014-09-02 13:03:19 +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
4717a5fca6 MDL-44725 Availability: Replace groupmembersonly - forms (4)
Remove groupmembersonly option from module editing forms.
2014-09-02 13:03:13 +01:00
sam marshall
dea081af23 MDL-44725 Availability: Replace groupmembersonly - backup (3)
Change backup and restore to not include the field, and to cope
correctly with 2.6 (and before) and 2.7 backups.
2014-09-02 13:03:11 +01:00
sam marshall
3d962d49cb MDL-44725 Availability: Replace groupmembersonly - core_availability (2)
Remove groupmembersonly usage in the core_availability API, and change
the update code (used in backup) so that it considers groupmembersonly
when restoring old backups.
2014-09-02 13:03:09 +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
Henning Bostelmann
7faf78cbae MDL-39929 Assignment: provide file upload area for assignment description 2014-09-02 11:02:16 +01:00
Damyon Wiese
5474b8bfbb Merge branch 'wip-MDL-47052-master' of git://github.com/marinaglancy/moodle 2014-09-02 15:30:07 +08:00
Marina Glancy
66aee2c201 MDL-47052 report_participation: fixed bug when filtering by first letter 2014-09-02 15:00:41 +08:00
Michael de Raadt
8f2e80600b MDL-46619 Forum: link to the discussion only if users cannot see posts. 2014-09-02 10:06:35 +08:00
Michael de Raadt
b53b69c134 MDL-46619 Forum: only output last poster's name if user can view it. 2014-09-02 10:06:23 +08:00
Marina Glancy
d0143e0061 Merge branch 'MDL-45952_master2' of git://github.com/Syxton/moodle 2014-09-02 09:58:24 +08:00
Eloy Lafuente (stronk7)
f9f715de75 Merge branch 'MDL-46633' of https://github.com/shashirepo/moodle 2014-09-02 02:12:14 +02:00
Eloy Lafuente (stronk7)
8e12ce67da Merge branch 'MDL-46979' of git://github.com/timhunt/moodle 2014-09-02 01:48:41 +02:00
Eloy Lafuente (stronk7)
a46d0e11c0 Merge branch 'MDL-45909_install_master' of https://github.com/nadavkav/moodle 2014-09-02 01:46:09 +02: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
2dbbc58dad Merge branch 'MDL-46852-master' of git://github.com/FMCorz/moodle 2014-09-01 16:16:08 +08: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
Marina Glancy
7dc74ce75f Merge branch 'MDL-46451_restoreError' of git://github.com/moodlerooms/moodle 2014-09-01 16:05:51 +08:00
Damyon Wiese
49025fdda7 Merge branch 'MDL-46902_master' of git://github.com/markn86/moodle 2014-09-01 15:53:44 +08:00
Damyon Wiese
c8336b9733 Merge branch 'MDL-46911' of https://github.com/bostelm/moodle 2014-09-01 15:42:01 +08:00
Damyon Wiese
caffd84d44 Merge branch 'm28_MDL-46985_7ZIP_RAR_MIME_types_missing' of https://github.com/scara/moodle 2014-09-01 15:33:54 +08:00
Damyon Wiese
e0e23395dd Merge branch 'master_MDL-46961' of https://github.com/danmarsden/moodle 2014-09-01 15:27:41 +08:00
Damyon Wiese
aac31be316 Merge branch 'wip-mdl-46670' of https://github.com/rajeshtaneja/moodle 2014-09-01 15:22:16 +08:00
Damyon Wiese
0908474990 Merge branch 'MDL-45818_master' of git://github.com/markn86/moodle 2014-09-01 15:15:24 +08:00
Marina Glancy
181435d483 Merge branch 'master_MDL-46639' of git://github.com/danmarsden/moodle 2014-09-01 14:36:09 +08:00
Marina Glancy
c1780a3d0b Merge branch 'MDL-46539-fix-28' of https://github.com/jmarthaler/moodle 2014-09-01 14:36:04 +08:00