integration.git
10 years agoMoodle release 2.5.9 MOODLE_25_STABLE v2.5.9
Eloy Lafuente (stronk7) [Sat, 8 Nov 2014 22:29:41 +0000 (23:29 +0100)]
Moodle release 2.5.9

10 years agoAutomatically generated installer lang files
AMOS bot [Sat, 8 Nov 2014 16:05:43 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoMerge branch 'MOODLE_25_STABLE' into install_25_STABLE
AMOS bot [Sat, 8 Nov 2014 16:05:42 +0000 (00:05 +0800)]
Merge branch 'MOODLE_25_STABLE' into install_25_STABLE

10 years agoMDL-47949 mod_wiki: Validate parameters for page deletion
John Okely [Fri, 31 Oct 2014 05:36:52 +0000 (13:36 +0800)]
MDL-47949 mod_wiki: Validate parameters for page deletion

10 years agoMDL-48019 mod_forum: Add sesskey checks when setting tracking prefs
Andrew Nicols [Mon, 3 Nov 2014 01:49:00 +0000 (09:49 +0800)]
MDL-48019 mod_forum: Add sesskey checks when setting tracking prefs

This also removes set_url() and changes require_course_login to
require_login as guests cannot set tracking.

10 years agoMDL-48013 calendar: force download of user files
Petr Skoda [Mon, 3 Nov 2014 19:41:34 +0000 (08:41 +1300)]
MDL-48013 calendar: force download of user files

Conflicts:
lib/filelib.php

10 years agoMDL-47927 LTI: Use PARAM_TEXT and p() for returned messages and errors
Damyon Wiese [Mon, 3 Nov 2014 22:46:57 +0000 (11:46 +1300)]
MDL-47927 LTI: Use PARAM_TEXT and p() for returned messages and errors

10 years agoMDL-47965 tag: Enforcing security of tag auto completion
Frederic Massart [Thu, 30 Oct 2014 06:34:24 +0000 (14:34 +0800)]
MDL-47965 tag: Enforcing security of tag auto completion

10 years agoMDL-47924 mod_lti: Fixing missing sesskey checking
David Monllao [Wed, 29 Oct 2014 06:30:19 +0000 (14:30 +0800)]
MDL-47924 mod_lti: Fixing missing sesskey checking

Also fixing a missing capability checking.

10 years agoMDL-47190 Ensure badges cannot be awarded without a role
Yuliya Bozhko [Tue, 28 Oct 2014 02:36:16 +0000 (15:36 +1300)]
MDL-47190 Ensure badges cannot be awarded without a role

Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
10 years agoMDL-47321 iplookup: Prevent guest users from using iplookup
Frederic Massart [Tue, 28 Oct 2014 04:04:08 +0000 (12:04 +0800)]
MDL-47321 iplookup: Prevent guest users from using iplookup

10 years agoMDL-47697 mod_data: Fix group id change when editing.
Adrian Greeve [Tue, 28 Oct 2014 02:20:37 +0000 (10:20 +0800)]
MDL-47697 mod_data: Fix group id change when editing.

When a teacher edits an entry in the database module
it would change the group ID to the one that the teacher
currently had selected.

Thanks to Steve Bond for providing a patch.

10 years agoMDL-47921 mod_lti: Add access control to mod/lti/launch.php
John Okely [Wed, 29 Oct 2014 02:50:25 +0000 (10:50 +0800)]
MDL-47921 mod_lti: Add access control to mod/lti/launch.php

10 years agoMDL-47050 core_wordlist: Updated wordlist to include only animals.
Dave Cooper [Tue, 28 Oct 2014 08:40:58 +0000 (16:40 +0800)]
MDL-47050 core_wordlist: Updated wordlist to include only animals.

10 years agoMDL-47287 prevent web access to phpunit boostrap
Petr Skoda [Thu, 18 Sep 2014 02:29:21 +0000 (14:29 +1200)]
MDL-47287 prevent web access to phpunit boostrap

10 years agoMDL-47865 mod_feedback - XSS through $searchstring in mod/feedback/mapcourse.php
Andreas Grabs [Sun, 26 Oct 2014 19:37:52 +0000 (20:37 +0100)]
MDL-47865 mod_feedback - XSS through $searchstring in mod/feedback/mapcourse.php

10 years agoMDL-47966 Add default content type and encoding
Petr Skoda [Wed, 29 Oct 2014 22:16:26 +0000 (11:16 +1300)]
MDL-47966 Add default content type and encoding

10 years agoAutomatically generated installer lang files
AMOS bot [Mon, 27 Oct 2014 16:05:42 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Tue, 21 Oct 2014 16:07:45 +0000 (00:07 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Mon, 13 Oct 2014 16:05:45 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Thu, 9 Oct 2014 16:05:36 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Sat, 4 Oct 2014 16:05:43 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Sat, 27 Sep 2014 16:09:36 +0000 (00:09 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Tue, 23 Sep 2014 16:06:08 +0000 (00:06 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Wed, 10 Sep 2014 16:05:47 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Tue, 9 Sep 2014 16:05:38 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoMoodle release 2.5.8 v2.5.8
Eloy Lafuente (stronk7) [Sat, 6 Sep 2014 11:01:35 +0000 (13:01 +0200)]
Moodle release 2.5.8

10 years agoMerge branch 'MOODLE_25_STABLE' into install_25_STABLE
AMOS bot [Fri, 5 Sep 2014 16:05:49 +0000 (00:05 +0800)]
Merge branch 'MOODLE_25_STABLE' into install_25_STABLE

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.

Conflicts:
mod/forum/lib.php

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.

Conflicts:
mod/forum/lib.php

10 years agoMDL-46619 Forum: whitespace fixes
Damyon Wiese [Mon, 1 Sep 2014 03:34:41 +0000 (11:34 +0800)]
MDL-46619 Forum: whitespace fixes

10 years agoMerge branch 'MDL-46619-2.5-visisble-authors-qanda' of https://github.com/amandadough...
Damyon Wiese [Mon, 1 Sep 2014 03:30:13 +0000 (11:30 +0800)]
Merge branch 'MDL-46619-2.5-visisble-authors-qanda' of https://github.com/amandadoughty/moodle into MOODLE_25_STABLE

10 years agoAutomatically generated installer lang files
AMOS bot [Sun, 31 Aug 2014 16:05:47 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Fri, 29 Aug 2014 16:05:41 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Wed, 27 Aug 2014 16:05:45 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Thu, 21 Aug 2014 16:05:39 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoMDL-46619 Forum: author showing in Q and A forum
Amanda Doughty [Thu, 21 Aug 2014 12:03:35 +0000 (13:03 +0100)]
MDL-46619 Forum: author showing in Q and A forum

10 years agoAutomatically generated installer lang files
AMOS bot [Wed, 20 Aug 2014 16:05:40 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Tue, 19 Aug 2014 16:05:36 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Wed, 13 Aug 2014 16:05:53 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoMDL-46737 SCORM: correct dml syntax.
Dan Marsden [Fri, 8 Aug 2014 03:10:11 +0000 (15:10 +1200)]
MDL-46737 SCORM: correct dml syntax.

10 years agoAutomatically generated installer lang files
AMOS bot [Thu, 31 Jul 2014 16:05:45 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Tue, 29 Jul 2014 08:02:29 +0000 (16:02 +0800)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Thu, 24 Jul 2014 22:42:14 +0000 (22:42 +0000)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Wed, 23 Jul 2014 22:46:33 +0000 (22:46 +0000)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Tue, 22 Jul 2014 22:49:26 +0000 (22:49 +0000)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Sun, 20 Jul 2014 00:44:38 +0000 (00:44 +0000)]
Automatically generated installer lang files

10 years agoAutomatically generated installer lang files
AMOS bot [Sat, 19 Jul 2014 00:42:06 +0000 (00:42 +0000)]
Automatically generated installer lang files

11 years agoAutomatically generated installer lang files
AMOS bot [Thu, 17 Jul 2014 00:53:09 +0000 (00:53 +0000)]
Automatically generated installer lang files

11 years agoAutomatically generated installer lang files
AMOS bot [Thu, 17 Jul 2014 00:53:09 +0000 (00:53 +0000)]
Automatically generated installer lang files

11 years agoMoodle release 2.5.7 v2.5.7
Eloy Lafuente (stronk7) [Sat, 12 Jul 2014 17:10:29 +0000 (19:10 +0200)]
Moodle release 2.5.7

11 years agoAutomatically generated installer lang files
AMOS bot [Sat, 12 Jul 2014 00:42:51 +0000 (00:42 +0000)]
Automatically generated installer lang files

11 years agoMerge branch 'MOODLE_25_STABLE' into install_25_STABLE
AMOS bot [Fri, 11 Jul 2014 00:44:28 +0000 (00:44 +0000)]
Merge branch 'MOODLE_25_STABLE' into install_25_STABLE

11 years agoMDL-46148 qtype_calculated: low-level defence against bad formulas
Ankit Agarwal [Thu, 10 Jul 2014 09:44:59 +0000 (17:44 +0800)]
MDL-46148 qtype_calculated: low-level defence against bad formulas

This catches things like:
 * Malicious equations coming from backup files.
 * Malicious equations in old questions in the database.

11 years agoMDL-38990 mod_forum: Restrict ability to post to all groups in a forum
Andrew Nicols [Tue, 27 May 2014 09:21:25 +0000 (17:21 +0800)]
MDL-38990 mod_forum: Restrict ability to post to all groups in a forum

In order to post to all groups in a forum, you must have the
moodle/site:accessallgroups capability.

Thanks to Jakob Ackermann <jackermann@onlineschool.ca> for part of the fix
on this one.

11 years agoMDL-46148 questions: Added missing allow_commit for transaction
Damyon Wiese [Thu, 10 Jul 2014 03:35:47 +0000 (11:35 +0800)]
MDL-46148 questions: Added missing allow_commit for transaction

11 years agoMDL-46148 qtype_calculatedsimple: fix notice
Tim Hunt [Wed, 9 Jul 2014 12:47:40 +0000 (13:47 +0100)]
MDL-46148 qtype_calculatedsimple: fix notice

... when adding a dataset with a formula error.

11 years agoMDL-46148 qtype_calculated: fix validation when importing.
Tim Hunt [Wed, 9 Jul 2014 12:35:09 +0000 (13:35 +0100)]
MDL-46148 qtype_calculated: fix validation when importing.

In order to do this in a sane way, I cleaned up a lot of old mess,
inclduing:

1. Previously, qtype_calcuated used ->answeres when importing, and
->answer when saving the form. This was crazy, so I fixed it, and
stripped out the code that made the alternative variable name work.

2. Similarly, it could handle ->answer being either an array, such as
you would get form the HTML editor, or a simple string, which is what
you get form the form. I simplified that too.

3. Finally, I made import use a transaction around saving each
question, so we don't get half questions in the database when an error
occurs.

11 years agoMDL-46148 qtype_calculated: removed unused method.
Tim Hunt [Wed, 9 Jul 2014 11:56:18 +0000 (12:56 +0100)]
MDL-46148 qtype_calculated: removed unused method.

11 years agoMDL-46223 Fix frequently used comments in the marking guide
David Mudrák [Wed, 9 Jul 2014 08:28:56 +0000 (10:28 +0200)]
MDL-46223 Fix frequently used comments in the marking guide

When the frequently used comment contains a character like >, re-use it
directly instead of its HTML entitiy.

11 years agoMDL-46223 Improve the display of marking guide validation message
David Mudrák [Wed, 9 Jul 2014 08:21:16 +0000 (10:21 +0200)]
MDL-46223 Improve the display of marking guide validation message

11 years agoMDL-45471 javascript: Escape content of exception dialogs
Frederic Massart [Thu, 8 May 2014 08:07:50 +0000 (16:07 +0800)]
MDL-45471 javascript: Escape content of exception dialogs

11 years agoMDL-43948 forms: setting types to filemanager and editor elements
Marina Glancy [Tue, 8 Jul 2014 02:11:40 +0000 (10:11 +0800)]
MDL-43948 forms: setting types to filemanager and editor elements

11 years agoMDL-46223 Improve the marking guide output
David Mudrák [Mon, 7 Jul 2014 07:52:37 +0000 (09:52 +0200)]
MDL-46223 Improve the marking guide output

11 years agoMDL-46223 Improve the rubric output
David Mudrák [Mon, 7 Jul 2014 04:38:47 +0000 (06:38 +0200)]
MDL-46223 Improve the rubric output

11 years agoMDL-46042 badges: Clean up external badge data
Yuliya Bozhko [Thu, 19 Jun 2014 21:44:33 +0000 (09:44 +1200)]
MDL-46042 badges: Clean up external badge data

Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
11 years agoMDL-45683 user: Escaping Skype ID used in profile
Osanda Malith Jayathissa [Wed, 4 Jun 2014 05:55:11 +0000 (13:55 +0800)]
MDL-45683 user: Escaping Skype ID used in profile

11 years agoMDL-45760 make sure to check permission before setting header
Marina Glancy [Fri, 4 Jul 2014 02:40:13 +0000 (10:40 +0800)]
MDL-45760 make sure to check permission before setting header

11 years agoMDL-46148 qtype_calculated: fix formula validation.
Tim Hunt [Thu, 26 Jun 2014 09:48:02 +0000 (10:48 +0100)]
MDL-46148 qtype_calculated: fix formula validation.

11 years agoMDL-45417 mod_imscp: Prevent entity injections from package content
Frederic Massart [Fri, 13 Jun 2014 07:40:15 +0000 (15:40 +0800)]
MDL-45417 mod_imscp: Prevent entity injections from package content

11 years agoMDL-45463 mod_lti: Prevent XML entity injections from provider
Frederic Massart [Tue, 10 Jun 2014 04:53:43 +0000 (12:53 +0800)]
MDL-45463 mod_lti: Prevent XML entity injections from provider

11 years agoMDL-45616 repositories: use json encoding instead of serialization
Marina Glancy [Thu, 26 Jun 2014 00:53:25 +0000 (08:53 +0800)]
MDL-45616 repositories: use json encoding instead of serialization

11 years agoMDL-45616 repositories: more clearly distinguish when we use source and when reference
Marina Glancy [Wed, 25 Jun 2014 06:40:27 +0000 (14:40 +0800)]
MDL-45616 repositories: more clearly distinguish when we use source and when reference

Function repository::get_moodle_file() should always be called on packed reference and not on the source received from user.
Also added phpdocs to some other methods that were confusing source and reference

11 years agoMDL-45485 auth_shibboleth: User taking over other user's session
Rex Lorenzo [Fri, 16 May 2014 22:26:25 +0000 (15:26 -0700)]
MDL-45485 auth_shibboleth: User taking over other user's session

Replacing code with call to complete_user_login() since it calls session_regenerate_id().

11 years agoMDL-43848 messages: do not display message content in popups
Dan Poltawski [Thu, 3 Jul 2014 14:52:31 +0000 (15:52 +0100)]
MDL-43848 messages: do not display message content in popups

The user is not in control of when these popups show up and it
may not be appropiate to have part of this content display whilst
in the presence of other users.

11 years agoAutomatically generated installer lang files
AMOS bot [Fri, 4 Jul 2014 00:44:36 +0000 (00:44 +0000)]
Automatically generated installer lang files

11 years agoAutomatically generated installer lang files
AMOS bot [Wed, 2 Jul 2014 00:44:54 +0000 (00:44 +0000)]
Automatically generated installer lang files

11 years agoAutomatically generated installer lang files
AMOS bot [Sun, 29 Jun 2014 00:43:06 +0000 (00:43 +0000)]
Automatically generated installer lang files

11 years agoAutomatically generated installer lang files
AMOS bot [Wed, 25 Jun 2014 00:45:42 +0000 (00:45 +0000)]
Automatically generated installer lang files

11 years agoAutomatically generated installer lang files
AMOS bot [Wed, 25 Jun 2014 00:45:42 +0000 (00:45 +0000)]
Automatically generated installer lang files

11 years agoAutomatically generated installer lang files
AMOS bot [Sat, 21 Jun 2014 00:43:51 +0000 (00:43 +0000)]
Automatically generated installer lang files

11 years agoAutomatically generated installer lang files
AMOS bot [Thu, 19 Jun 2014 00:43:05 +0000 (00:43 +0000)]
Automatically generated installer lang files

11 years agoAutomatically generated installer lang files
AMOS bot [Wed, 18 Jun 2014 00:42:41 +0000 (00:42 +0000)]
Automatically generated installer lang files

11 years agoAutomatically generated installer lang files
AMOS bot [Sun, 15 Jun 2014 00:43:00 +0000 (00:43 +0000)]
Automatically generated installer lang files

11 years agoAutomatically generated installer lang files
AMOS bot [Thu, 12 Jun 2014 00:43:50 +0000 (00:43 +0000)]
Automatically generated installer lang files

11 years agoAutomatically generated installer lang files
AMOS bot [Fri, 30 May 2014 01:24:44 +0000 (01:24 +0000)]
Automatically generated installer lang files

11 years agoAutomatically generated installer lang files
AMOS bot [Fri, 30 May 2014 01:24:44 +0000 (01:24 +0000)]
Automatically generated installer lang files

11 years agoweekly release 2.5.6+
Eloy Lafuente (stronk7) [Thu, 29 May 2014 10:51:25 +0000 (12:51 +0200)]
weekly release 2.5.6+

11 years agoMerge branch 'install_25_STABLE' of https://git.in.moodle.com/amosbot/moodle-install...
Eloy Lafuente (stronk7) [Thu, 29 May 2014 10:51:20 +0000 (12:51 +0200)]
Merge branch 'install_25_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_25_STABLE

11 years agoMerge branch 'wip-mdl-45698-m25' of https://github.com/rajeshtaneja/moodle into MOODL...
Sam Hemelryk [Thu, 29 May 2014 02:28:01 +0000 (14:28 +1200)]
Merge branch 'wip-mdl-45698-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE

11 years agoMDL-45698 behat: Fixed behat and symfony versions
Rajesh Taneja [Thu, 29 May 2014 01:50:22 +0000 (09:50 +0800)]
MDL-45698 behat: Fixed behat and symfony versions

11 years agoMerge branch 'MDL-45661-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE
Marina Glancy [Mon, 26 May 2014 06:47:54 +0000 (14:47 +0800)]
Merge branch 'MDL-45661-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE

11 years agoMerge branch 'MDL-44482-25' of git://github.com/jethac/moodle into MOODLE_25_STABLE
Marina Glancy [Mon, 26 May 2014 06:47:45 +0000 (14:47 +0800)]
Merge branch 'MDL-44482-25' of git://github.com/jethac/moodle into MOODLE_25_STABLE

11 years agoMDL-44482 mod_lti: use localized dates
Jetha Chan [Fri, 23 May 2014 07:59:14 +0000 (15:59 +0800)]
MDL-44482 mod_lti: use localized dates

Fixed an issue where LTI external tools had creation datestamps of NaN/NaN/NaN under particular non-English languages.

11 years agoMDL-45688 added missing library requirement
Marina Glancy [Sat, 24 May 2014 10:30:28 +0000 (18:30 +0800)]
MDL-45688 added missing library requirement

Conflicts:
course/modlib.php

11 years agoMDL-45661 Assign: Clean bad data from DB after MDL-42526
Damyon Wiese [Thu, 22 May 2014 06:33:49 +0000 (14:33 +0800)]
MDL-45661 Assign: Clean bad data from DB after MDL-42526

Conflicts:
mod/assign/db/upgrade.php
mod/assign/version.php

11 years agoMerge branch '45499-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE
Damyon Wiese [Mon, 26 May 2014 04:13:52 +0000 (12:13 +0800)]
Merge branch '45499-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE

11 years agoMerge branch 'MDL-42526-25' of git://github.com/jamiepratt/moodle into MOODLE_25_STABLE
Sam Hemelryk [Sun, 25 May 2014 22:33:47 +0000 (10:33 +1200)]
Merge branch 'MDL-42526-25' of git://github.com/jamiepratt/moodle into MOODLE_25_STABLE

11 years agoMerge branch 'm25_MDL-45623' of git://github.com/totara/moodle into MOODLE_25_STABLE
Sam Hemelryk [Sun, 25 May 2014 21:58:53 +0000 (09:58 +1200)]
Merge branch 'm25_MDL-45623' of git://github.com/totara/moodle into MOODLE_25_STABLE

11 years agoMDL-45499 admin: fixed error when displaying page settings
Sam Hemelryk [Tue, 20 May 2014 21:11:39 +0000 (09:11 +1200)]
MDL-45499 admin: fixed error when displaying page settings