moodle.git
10 years agoMerge branch 'MDL-47012-m' of git://github.com/micaherne/moodle
Marina Glancy [Tue, 9 Sep 2014 09:16:15 +0000 (17:16 +0800)]
Merge branch 'MDL-47012-m' of git://github.com/micaherne/moodle

10 years agoMerge branch 'master_MDL-47076' of git://github.com/totara/moodle
Marina Glancy [Tue, 9 Sep 2014 09:12:28 +0000 (17:12 +0800)]
Merge branch 'master_MDL-47076' of git://github.com/totara/moodle

10 years agoMDL-47080 theme: call format_string on site shortname
Marina Glancy [Wed, 3 Sep 2014 07:45:47 +0000 (15:45 +0800)]
MDL-47080 theme: call format_string on site shortname

10 years agoMerge branch 'MDL-46572_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 9 Sep 2014 08:18:00 +0000 (09:18 +0100)]
Merge branch 'MDL-46572_master' of https://github.com/markn86/moodle

10 years agoMerge branch 'MDL-46696-master-fixup' of https://github.com/FMCorz/moodle
Dan Poltawski [Tue, 9 Sep 2014 07:46:01 +0000 (08:46 +0100)]
Merge branch 'MDL-46696-master-fixup' of https://github.com/FMCorz/moodle

10 years agoMerge branch 'wip-MDL-46834-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 9 Sep 2014 07:06:40 +0000 (08:06 +0100)]
Merge branch 'wip-MDL-46834-master' of git://github.com/marinaglancy/moodle

10 years agoMDL-47076 badges: Add checks to user fields during badges restoration
David Curry [Wed, 3 Sep 2014 03:51:22 +0000 (15:51 +1200)]
MDL-47076 badges: Add checks to user fields during badges restoration

Change-Id: Iff6402d1da835ed57dc17d079adf1bbd2e76dd6c

10 years agoMDL-46696 backup: Handle older backups not containing grade history
Frederic Massart [Tue, 9 Sep 2014 02:21:16 +0000 (10:21 +0800)]
MDL-46696 backup: Handle older backups not containing grade history

10 years agoMDL-46834 dndupload: Hide dnd message when user cant upload files
Marina Glancy [Thu, 4 Sep 2014 07:46:20 +0000 (15:46 +0800)]
MDL-46834 dndupload: Hide dnd message when user cant upload files

10 years agoMDL-46834 filepicker: dnd upload should respect the current context id
Marina Glancy [Tue, 9 Sep 2014 02:01:35 +0000 (10:01 +0800)]
MDL-46834 filepicker: dnd upload should respect the current context id

10 years agoMerge branch 'm28_MDL-47054' of git://github.com/totara/moodle
Eloy Lafuente (stronk7) [Tue, 9 Sep 2014 00:18:59 +0000 (02:18 +0200)]
Merge branch 'm28_MDL-47054' of git://github.com/totara/moodle

10 years agoMerge branch 'MDL-47107-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 9 Sep 2014 00:15:26 +0000 (02:15 +0200)]
Merge branch 'MDL-47107-master' of git://github.com/andrewnicols/moodle

10 years agoMerge branch 'MDL-46428_master3' of https://github.com/Syxton/moodle
Eloy Lafuente (stronk7) [Mon, 8 Sep 2014 23:33:44 +0000 (01:33 +0200)]
Merge branch 'MDL-46428_master3' of https://github.com/Syxton/moodle

10 years agoMerge branch 'MDL-40451-master-random-glossary-block-title' of git://github.com/amand...
Dan Poltawski [Mon, 8 Sep 2014 16:26:56 +0000 (17:26 +0100)]
Merge branch 'MDL-40451-master-random-glossary-block-title' of git://github.com/amandadoughty/moodle

10 years agoMerge branch 'wip-MDL-45602-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 8 Sep 2014 15:30:33 +0000 (16:30 +0100)]
Merge branch 'wip-MDL-45602-master' of git://github.com/marinaglancy/moodle

10 years agoMerge branch 'MDL-46696-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 8 Sep 2014 15:23:59 +0000 (16:23 +0100)]
Merge branch 'MDL-46696-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-46586-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 8 Sep 2014 14:31:13 +0000 (15:31 +0100)]
Merge branch 'MDL-46586-master' of git://github.com/jleyva/moodle

10 years agoMerge branch 'wip-MDL-43739-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 8 Sep 2014 14:16:38 +0000 (15:16 +0100)]
Merge branch 'wip-MDL-43739-master' of git://github.com/marinaglancy/moodle

10 years agoMerge branch 'MDL-47122' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 8 Sep 2014 13:28:30 +0000 (14:28 +0100)]
Merge branch 'MDL-47122' of git://github.com/timhunt/moodle

10 years agoMDL-47122 question_engine_data_mapper: which methods are public.
Tim Hunt [Mon, 8 Sep 2014 12:24:17 +0000 (13:24 +0100)]
MDL-47122 question_engine_data_mapper: which methods are public.

That is, which may be used from outside the question engine.

10 years agoMerge branch 'MDL-46982' of https://github.com/shashirepo/moodle
Dan Poltawski [Mon, 8 Sep 2014 11:22:27 +0000 (12:22 +0100)]
Merge branch 'MDL-46982' of https://github.com/shashirepo/moodle

10 years agoMerge branch 'MDL-47014' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 8 Sep 2014 11:19:24 +0000 (12:19 +0100)]
Merge branch 'MDL-47014' of git://github.com/jleyva/moodle

10 years agoMerge branch 'wip-MDL-46254-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 8 Sep 2014 11:14:51 +0000 (12:14 +0100)]
Merge branch 'wip-MDL-46254-master' of git://github.com/marinaglancy/moodle

10 years agoMDL-47014 airnotifier: Missing require of filelib.php
Juan Leyva [Wed, 3 Sep 2014 11:45:21 +0000 (13:45 +0200)]
MDL-47014 airnotifier: Missing require of filelib.php

10 years agoMerge branch 'MDL-46818_master' of git://github.com/markn86/moodle
Marina Glancy [Mon, 8 Sep 2014 06:04:33 +0000 (14:04 +0800)]
Merge branch 'MDL-46818_master' of git://github.com/markn86/moodle

10 years agoMDL-43739 block_course_overview: allow resorting of big number of courses
Marina Glancy [Fri, 8 Aug 2014 06:32:41 +0000 (14:32 +0800)]
MDL-43739 block_course_overview: allow resorting of big number of courses

previously an exception was thrown if the user preference exceeds 1333 chars

10 years agoMDL-46254 theme: apply filters to theme footnote
Marina Glancy [Tue, 2 Sep 2014 05:56:54 +0000 (13:56 +0800)]
MDL-46254 theme: apply filters to theme footnote

10 years agoMerge branch 'MDL-46587-master' of git://github.com/jleyva/moodle
Marina Glancy [Mon, 8 Sep 2014 05:48:37 +0000 (13:48 +0800)]
Merge branch 'MDL-46587-master' of git://github.com/jleyva/moodle

10 years agoMerge branch 'MDL-46761' of git://github.com/timhunt/moodle
Marina Glancy [Mon, 8 Sep 2014 05:48:26 +0000 (13:48 +0800)]
Merge branch 'MDL-46761' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-46821-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Mon, 8 Sep 2014 05:48:15 +0000 (13:48 +0800)]
Merge branch 'MDL-46821-master' of git://github.com/ankitagarwal/moodle

10 years agoMerge branch 'MDL-46564_master' of https://github.com/totara/openbadges
Marina Glancy [Mon, 8 Sep 2014 05:48:06 +0000 (13:48 +0800)]
Merge branch 'MDL-46564_master' of https://github.com/totara/openbadges

10 years agoMerge branch 'MDL-47060-master' of git://github.com/damyon/moodle
Marina Glancy [Mon, 8 Sep 2014 04:57:41 +0000 (12:57 +0800)]
Merge branch 'MDL-47060-master' of git://github.com/damyon/moodle

10 years agoMerge branch 'MDL-44304-master' of git://github.com/damyon/moodle
Marina Glancy [Mon, 8 Sep 2014 04:57:34 +0000 (12:57 +0800)]
Merge branch 'MDL-44304-master' of git://github.com/damyon/moodle

10 years agoMDL-46761 fix PHPdocs on question_usage_by_activity::get_total_mark
Tim Hunt [Sun, 7 Sep 2014 10:37:43 +0000 (11:37 +0100)]
MDL-46761 fix PHPdocs on question_usage_by_activity::get_total_mark

Thanks to Tony Gardner-Medwin for spotting this.

10 years agoMDL-46587 files: Invalid $itemid conversion in core_files_get_files Web Service
Juan Leyva [Wed, 3 Sep 2014 15:04:11 +0000 (17:04 +0200)]
MDL-46587 files: Invalid $itemid conversion in core_files_get_files Web Service

10 years agoMDL-46586 files: Invalid return parameters definition in core_files_get_files externa...
Juan Leyva [Wed, 3 Sep 2014 14:58:02 +0000 (16:58 +0200)]
MDL-46586 files: Invalid return parameters definition in core_files_get_files external function

10 years agoMDL-45602 behat: add members to cohorts
Marina Glancy [Sun, 18 May 2014 01:21:14 +0000 (09:21 +0800)]
MDL-45602 behat: add members to cohorts

10 years agoMDL-47107 mod_forum Optimise forum subscription checks
Andrew Nicols [Thu, 4 Sep 2014 12:06:55 +0000 (20:06 +0800)]
MDL-47107 mod_forum Optimise forum subscription checks

Supply a coursemodule where relevant to the forum subscription checks.

10 years agoMDL-46982 core: fixes wrong opening div tag
shashirepo [Tue, 2 Sep 2014 04:57:35 +0000 (10:27 +0530)]
MDL-46982 core:  fixes wrong opening div tag

10 years agoMDL-47122 use insert_records to improve question engine performance.
Tim Hunt [Thu, 4 Sep 2014 22:15:27 +0000 (23:15 +0100)]
MDL-47122 use insert_records to improve question engine performance.

10 years agoMDL-46428 course: Remove confirm when duplicating
Syxton [Thu, 21 Aug 2014 12:52:33 +0000 (08:52 -0400)]
MDL-46428 course: Remove confirm when duplicating

A confirm dialog is given when Javascript is off but not when it is on.
This aligns the two so that they neither have a confirm when duplicating
an activity.

10 years agoweekly release 2.8dev
Eloy Lafuente (stronk7) [Thu, 4 Sep 2014 17:54:47 +0000 (19:54 +0200)]
weekly release 2.8dev

10 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 4 Sep 2014 17:54:36 +0000 (19:54 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

10 years agoMDL-44725 Availability: Unit test for tree::get_user_list_sql
sam marshall [Wed, 3 Sep 2014 17:03:50 +0000 (18:03 +0100)]
MDL-44725 Availability: Unit test for tree::get_user_list_sql

10 years agoMDL-47054 theme: fixed issue with the user rtl table
Brian Barnes [Wed, 3 Sep 2014 01:50:23 +0000 (13:50 +1200)]
MDL-47054 theme: fixed issue with the user rtl table

10 years agoMerge branch 'MDL-47031-master-enfix' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 3 Sep 2014 17:25:38 +0000 (19:25 +0200)]
Merge branch 'MDL-47031-master-enfix' of git://github.com/mudrd8mz/moodle

10 years agoMDL-40451 block/glossary_random Fixed missing header when adding new block
Amanda Doughty [Wed, 3 Sep 2014 13:01:54 +0000 (14:01 +0100)]
MDL-40451 block/glossary_random Fixed missing header when adding new block

10 years agoMerge branch 'master_MDL-46639' of git://github.com/danmarsden/moodle
Marina Glancy [Wed, 3 Sep 2014 08:58:25 +0000 (16:58 +0800)]
Merge branch 'master_MDL-46639' of git://github.com/danmarsden/moodle

10 years agoMDL-46639 SCORM: incorrect setting of launch param, it is done in scorm_parse_aicc
Dan Marsden [Wed, 3 Sep 2014 08:18:55 +0000 (20:18 +1200)]
MDL-46639 SCORM: incorrect setting of launch param, it is done in scorm_parse_aicc

10 years agoMDL-47031 Merge English strings from the en_fix language pack
Helen Foster [Wed, 3 Sep 2014 08:02:56 +0000 (10:02 +0200)]
MDL-47031 Merge English strings from the en_fix language pack

10 years agoMDL-47060 Atto: Autosave - play nicely with HTML source view.
Damyon Wiese [Tue, 2 Sep 2014 07:21:33 +0000 (15:21 +0800)]
MDL-47060 Atto: Autosave - play nicely with HTML source view.

There are 2 fixes here:
1. do not overwrite the changes to the HTML source when we do an autosave.
2. Move the Atto notifications alert to the containing div so it aligns properly for either view.

10 years agoMDL-46564 badges: Fix 'All' option in badges block
Yuliya Bozhko [Wed, 3 Sep 2014 06:43:31 +0000 (18:43 +1200)]
MDL-46564 badges: Fix 'All' option in badges block

Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
10 years agoMDL-46821 gradereport_user: Fix background color of user report
Ankit Agarwal [Tue, 2 Sep 2014 06:29:12 +0000 (11:59 +0530)]
MDL-46821 gradereport_user: Fix background color of user report

10 years agoMDL-44725 dml: added sql_intersect()
Marina Glancy [Wed, 3 Sep 2014 04:14:47 +0000 (12:14 +0800)]
MDL-44725 dml: added sql_intersect()

10 years agoMerge branch 'wip-MDL-30414-master' of https://github.com/mackensen/moodle
Eloy Lafuente (stronk7) [Tue, 2 Sep 2014 23:08:17 +0000 (01:08 +0200)]
Merge branch 'wip-MDL-30414-master' of https://github.com/mackensen/moodle

10 years agoMerge branch 'MDL-39929' of https://github.com/bostelm/moodle
Eloy Lafuente (stronk7) [Tue, 2 Sep 2014 22:13:53 +0000 (00:13 +0200)]
Merge branch 'MDL-39929' of https://github.com/bostelm/moodle

10 years agoMDL-44725 Availability: Replace groupmembersonly - feedback (16)
sam marshall [Tue, 2 Sep 2014 11:53:20 +0000 (12:53 +0100)]
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).

10 years agoMDL-44725 workshop: correct module generation in unittests (15)
Marina Glancy [Tue, 2 Sep 2014 05:26:47 +0000 (13:26 +0800)]
MDL-44725 workshop: correct module generation in unittests (15)

10 years agoMDL-44725 Add Behat support for setting grouping condition (14)
sam marshall [Mon, 1 Sep 2014 12:35:54 +0000 (13:35 +0100)]
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.

10 years agoMDL-44725 Update cm_info::create to allow 'false' param (13)
sam marshall [Mon, 1 Sep 2014 10:18:16 +0000 (11:18 +0100)]
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.

10 years agoMDL-44725 Availability: Replace groupmembersonly - workshop (12)
sam marshall [Wed, 6 Aug 2014 10:32:45 +0000 (11:32 +0100)]
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).

10 years agoMDL-44725 Availability: Add SQL feature for user lists (11)
sam marshall [Tue, 5 Aug 2014 16:30:09 +0000 (17:30 +0100)]
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.

10 years agoMDL-44725 Availability: Replace groupmembersonly - assign (10)
sam marshall [Thu, 7 Aug 2014 12:39:54 +0000 (13:39 +0100)]
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.)

10 years agoMDL-44725 Availability: Replace groupmembersonly - quiz overrides (9)
sam marshall [Fri, 1 Aug 2014 16:54:30 +0000 (17:54 +0100)]
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.

10 years agoMDL-44725 Availability: Replace groupmembersonly - glossary (8)
sam marshall [Thu, 7 Aug 2014 12:39:43 +0000 (13:39 +0100)]
MDL-44725 Availability: Replace groupmembersonly - glossary (8)

No change to actual module, only unit tests.

10 years agoMDL-44725 Availability: Add utility API to make unit testing easier (7)
sam marshall [Tue, 26 Aug 2014 17:07:16 +0000 (18:07 +0100)]
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.

10 years agoMDL-44725 Availability: Replace groupmembersonly - FEATURE_xx (6)
sam marshall [Fri, 1 Aug 2014 16:44:48 +0000 (17:44 +0100)]
MDL-44725 Availability: Replace groupmembersonly - FEATURE_xx (6)

Remove old FEATURE_GROUPMEMBERSONLY as no longer required.

10 years agoMDL-44725 Availability: Replace groupmembersonly - login (5)
sam marshall [Fri, 1 Aug 2014 16:39:51 +0000 (17:39 +0100)]
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.

10 years agoMDL-44725 Availability: Replace groupmembersonly - forms (4)
sam marshall [Fri, 1 Aug 2014 16:13:05 +0000 (17:13 +0100)]
MDL-44725 Availability: Replace groupmembersonly - forms (4)

Remove groupmembersonly option from module editing forms.

10 years agoMDL-44725 Availability: Replace groupmembersonly - backup (3)
sam marshall [Fri, 1 Aug 2014 16:05:56 +0000 (17:05 +0100)]
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.

10 years agoMDL-44725 Availability: Replace groupmembersonly - core_availability (2)
sam marshall [Fri, 1 Aug 2014 16:07:17 +0000 (17:07 +0100)]
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.

10 years agoMDL-44725 Availability: Replace groupmembersonly - upgrade, core (1)
sam marshall [Fri, 1 Aug 2014 14:05:56 +0000 (15:05 +0100)]
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.

10 years agoMDL-39929 Assignment: provide file upload area for assignment description
Henning Bostelmann [Mon, 24 Mar 2014 21:34:42 +0000 (21:34 +0000)]
MDL-39929 Assignment: provide file upload area for assignment description

10 years agoMerge branch 'wip-MDL-47052-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 2 Sep 2014 07:30:07 +0000 (15:30 +0800)]
Merge branch 'wip-MDL-47052-master' of git://github.com/marinaglancy/moodle

10 years agoMDL-47052 report_participation: fixed bug when filtering by first letter
Marina Glancy [Tue, 2 Sep 2014 01:39:57 +0000 (09:39 +0800)]
MDL-47052 report_participation: fixed bug when filtering by first letter

10 years agoMDL-46818 core_grades: added YUI form change validation
Mark Nelson [Tue, 2 Sep 2014 04:46:43 +0000 (21:46 -0700)]
MDL-46818 core_grades: added YUI form change validation

10 years agoMDL-46619 Forum: link to the discussion only if users cannot see posts.
Michael de Raadt [Tue, 2 Sep 2014 01:57:36 +0000 (09:57 +0800)]
MDL-46619 Forum: link to the discussion only if users cannot see posts.

10 years agoMDL-46619 Forum: only output last poster's name if user can view it.
Michael de Raadt [Tue, 2 Sep 2014 00:59:43 +0000 (08:59 +0800)]
MDL-46619 Forum: only output last poster's name if user can view it.

10 years agoMerge branch 'MDL-45952_master2' of git://github.com/Syxton/moodle
Marina Glancy [Tue, 2 Sep 2014 01:58:24 +0000 (09:58 +0800)]
Merge branch 'MDL-45952_master2' of git://github.com/Syxton/moodle

10 years agoMerge branch 'MDL-46633' of https://github.com/shashirepo/moodle
Eloy Lafuente (stronk7) [Tue, 2 Sep 2014 00:12:14 +0000 (02:12 +0200)]
Merge branch 'MDL-46633' of https://github.com/shashirepo/moodle

10 years agoMerge branch 'MDL-46979' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 1 Sep 2014 23:48:41 +0000 (01:48 +0200)]
Merge branch 'MDL-46979' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-45909_install_master' of https://github.com/nadavkav/moodle
Eloy Lafuente (stronk7) [Mon, 1 Sep 2014 23:46:09 +0000 (01:46 +0200)]
Merge branch 'MDL-45909_install_master' of https://github.com/nadavkav/moodle

10 years agoMerge branch 'MDL-43639_updatePassEveryLogin' of https://github.com/moodlerooms/moodle
Eloy Lafuente (stronk7) [Mon, 1 Sep 2014 23:07:36 +0000 (01:07 +0200)]
Merge branch 'MDL-43639_updatePassEveryLogin' of https://github.com/moodlerooms/moodle

10 years agoMDL-46696 backup: Include grade history in backups
Frederic Massart [Tue, 19 Aug 2014 08:02:00 +0000 (16:02 +0800)]
MDL-46696 backup: Include grade history in backups

10 years agoMDL-47012 core_enrol: remove desc and fix alias from ordering
Michael Aherne [Fri, 29 Aug 2014 08:01:04 +0000 (09:01 +0100)]
MDL-47012 core_enrol: remove desc and fix alias from ordering

10 years agoMerge branch 'MDL-46852-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 1 Sep 2014 08:16:08 +0000 (16:16 +0800)]
Merge branch 'MDL-46852-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'wip-MDL-46540-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 1 Sep 2014 08:08:19 +0000 (16:08 +0800)]
Merge branch 'wip-MDL-46540-master' of git://github.com/marinaglancy/moodle

10 years agoMDL-46540 stats: missing include file
Marina Glancy [Sat, 16 Aug 2014 11:19:59 +0000 (19:19 +0800)]
MDL-46540 stats: missing include file

Thanks to Vadim Dvorovenko for finding a bug and providing a solution

10 years agoMerge branch 'MDL-46861' of https://github.com/Lightwork-Marking/moodle
Marina Glancy [Mon, 1 Sep 2014 08:06:22 +0000 (16:06 +0800)]
Merge branch 'MDL-46861' of https://github.com/Lightwork-Marking/moodle

10 years agoMerge branch 'MDL-46451_restoreError' of git://github.com/moodlerooms/moodle
Marina Glancy [Mon, 1 Sep 2014 08:05:51 +0000 (16:05 +0800)]
Merge branch 'MDL-46451_restoreError' of git://github.com/moodlerooms/moodle

10 years agoMerge branch 'MDL-46902_master' of git://github.com/markn86/moodle
Damyon Wiese [Mon, 1 Sep 2014 07:53:44 +0000 (15:53 +0800)]
Merge branch 'MDL-46902_master' of git://github.com/markn86/moodle

10 years agoMerge branch 'MDL-46911' of https://github.com/bostelm/moodle
Damyon Wiese [Mon, 1 Sep 2014 07:42:01 +0000 (15:42 +0800)]
Merge branch 'MDL-46911' of https://github.com/bostelm/moodle

10 years agoMerge branch 'm28_MDL-46985_7ZIP_RAR_MIME_types_missing' of https://github.com/scara...
Damyon Wiese [Mon, 1 Sep 2014 07:33:54 +0000 (15:33 +0800)]
Merge branch 'm28_MDL-46985_7ZIP_RAR_MIME_types_missing' of https://github.com/scara/moodle

10 years agoMerge branch 'master_MDL-46961' of https://github.com/danmarsden/moodle
Damyon Wiese [Mon, 1 Sep 2014 07:27:41 +0000 (15:27 +0800)]
Merge branch 'master_MDL-46961' of https://github.com/danmarsden/moodle

10 years agoMerge branch 'wip-mdl-46670' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Mon, 1 Sep 2014 07:22:16 +0000 (15:22 +0800)]
Merge branch 'wip-mdl-46670' of https://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'MDL-45818_master' of git://github.com/markn86/moodle
Damyon Wiese [Mon, 1 Sep 2014 07:15:24 +0000 (15:15 +0800)]
Merge branch 'MDL-45818_master' of git://github.com/markn86/moodle

10 years agoMerge branch 'master_MDL-46639' of git://github.com/danmarsden/moodle
Marina Glancy [Mon, 1 Sep 2014 06:36:09 +0000 (14:36 +0800)]
Merge branch 'master_MDL-46639' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'MDL-46539-fix-28' of https://github.com/jmarthaler/moodle
Marina Glancy [Mon, 1 Sep 2014 06:36:04 +0000 (14:36 +0800)]
Merge branch 'MDL-46539-fix-28' of https://github.com/jmarthaler/moodle

10 years agoMDL-46852 mod_lesson: More accurate comparison of shortanswer answers
Frederic Massart [Mon, 1 Sep 2014 06:23:50 +0000 (14:23 +0800)]
MDL-46852 mod_lesson: More accurate comparison of shortanswer answers

10 years agoMerge branch 'wip-MDL-39233-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 1 Sep 2014 05:35:50 +0000 (13:35 +0800)]
Merge branch 'wip-MDL-39233-master' of git://github.com/marinaglancy/moodle