Sam Hemelryk [Mon, 7 Jul 2014 20:29:45 +0000 (08:29 +1200)]
Merge branch 'MDL-16474-master' of git://github.com/FMCorz/moodle
Adrian Greeve [Tue, 1 Jul 2014 05:46:25 +0000 (13:46 +0800)]
MDL-46201 events: Sanitization of username before returning the description.
Yuliya Bozhko [Wed, 18 Jun 2014 22:54:11 +0000 (10:54 +1200)]
MDL-46042 badges: Clean up external badge data
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
Dan Poltawski [Mon, 7 Jul 2014 15:27:29 +0000 (16:27 +0100)]
Merge branch 'MDL-42393-master' of git://github.com/FMCorz/moodle
Osanda Malith Jayathissa [Wed, 4 Jun 2014 05:55:11 +0000 (13:55 +0800)]
MDL-45683 user: Escaping Skype ID used in profile
Marina Glancy [Mon, 30 Jun 2014 08:36:49 +0000 (16:36 +0800)]
MDL-45760 make sure to check permission before setting header
Tim Hunt [Thu, 26 Jun 2014 14:37:33 +0000 (15:37 +0100)]
MDL-46148 qtype_calculated: validate formulas everywhere.
Tim Hunt [Thu, 26 Jun 2014 13:54:52 +0000 (14:54 +0100)]
MDL-46148 qtype_calculated: function to validate equations in text.
Tim Hunt [Thu, 26 Jun 2014 09:51:28 +0000 (10:51 +0100)]
MDL-46148 qtype_calculated: Remove unused function.
Tim Hunt [Thu, 26 Jun 2014 09:48:02 +0000 (10:48 +0100)]
MDL-46148 qtype_calculated: unit tests + fixes for validation
Frederic Massart [Fri, 13 Jun 2014 07:40:15 +0000 (15:40 +0800)]
MDL-45417 mod_imscp: Prevent entity injections from package content
Frederic Massart [Tue, 10 Jun 2014 04:53:43 +0000 (12:53 +0800)]
MDL-45463 mod_lti: Prevent XML entity injections from provider
Marina Glancy [Wed, 25 Jun 2014 06:46:13 +0000 (14:46 +0800)]
MDL-45616 repositories: API changes to avoid serialized data in user input
Marina Glancy [Thu, 26 Jun 2014 00:53:25 +0000 (08:53 +0800)]
MDL-45616 repositories: use json encoding instead of serialization
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
Dan Poltawski [Fri, 4 Jul 2014 11:15:23 +0000 (12:15 +0100)]
MDL-43848 message: remove unused strings
Dan Poltawski [Thu, 3 Jul 2014 14:18:39 +0000 (15:18 +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.
Dan Poltawski [Thu, 3 Jul 2014 09:53:14 +0000 (10:53 +0100)]
weekly release 2.8dev
Dan Poltawski [Thu, 3 Jul 2014 09:53:11 +0000 (10:53 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Marina Glancy [Thu, 3 Jul 2014 06:00:40 +0000 (14:00 +0800)]
MDL-46163 question/quiz: fix elements ids and their labels
Tim Hunt [Wed, 2 Jul 2014 13:26:59 +0000 (14:26 +0100)]
MDL-46163 quiz/questions: fix missing hidden fields.
I have done this by eliminating the duplication between the base class
and the subclass.
This was a regression introdcued by MDL-40313.
Dan Poltawski [Wed, 2 Jul 2014 06:22:15 +0000 (07:22 +0100)]
MDL-46163 question: fix missing ;
Marina Glancy [Wed, 2 Jul 2014 03:52:12 +0000 (11:52 +0800)]
Merge branch '41663-28' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Wed, 2 Jul 2014 03:13:18 +0000 (15:13 +1200)]
Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Wed, 2 Jul 2014 01:51:45 +0000 (13:51 +1200)]
MDL-41663 output: fix for methods with _renderable suffix
Eric Merrill [Wed, 2 Jul 2014 02:28:22 +0000 (22:28 -0400)]
MDL-42071 caching Validate setservers correctly for php pre 5.5
AMOS bot [Wed, 2 Jul 2014 00:44:32 +0000 (00:44 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Tue, 1 Jul 2014 22:21:21 +0000 (00:21 +0200)]
Merge branch 'wip-mdl-45889' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 1 Jul 2014 21:59:31 +0000 (23:59 +0200)]
Merge branch 'MDL-45379' of https://github.com/totara/openbadges
Eloy Lafuente (stronk7) [Tue, 1 Jul 2014 21:49:58 +0000 (23:49 +0200)]
Merge branch '45209-28' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Tue, 1 Jul 2014 21:31:34 +0000 (09:31 +1200)]
Merge branch 'wip-MDL-46147-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 1 Jul 2014 21:21:29 +0000 (09:21 +1200)]
Merge branch 'wip-MDL-45507_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Tue, 1 Jul 2014 17:19:59 +0000 (19:19 +0200)]
MDL-45961 user profile: track user on reset
It seems that redirect (after reset button) was also
missing the userid so the user track was lost.
Eloy Lafuente (stronk7) [Tue, 1 Jul 2014 17:13:43 +0000 (19:13 +0200)]
Merge branch 'MDL-45961' of https://github.com/NeillM/moodle
Dan Poltawski [Tue, 1 Jul 2014 16:29:14 +0000 (17:29 +0100)]
Merge branch 'MDL-46063_master' of git://github.com/schach/moodle
Dan Poltawski [Tue, 1 Jul 2014 14:58:11 +0000 (15:58 +0100)]
Merge branch 'MDL-46036_survey' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 1 Jul 2014 14:41:04 +0000 (15:41 +0100)]
Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle
Eric Merrill [Tue, 1 Jul 2014 14:25:10 +0000 (10:25 -0400)]
MDL-42071 caching Skip memcache(d) tests if no servers defined
Dan Poltawski [Tue, 1 Jul 2014 13:20:44 +0000 (14:20 +0100)]
Merge branch 'MDL-46107_master' of https://github.com/totara/openbadges
Dan Poltawski [Tue, 1 Jul 2014 13:16:04 +0000 (14:16 +0100)]
Merge branch 'MDL-46163_category_selector_renders_as_nested_form' of https://github.com/MorrisR2/moodle
Dan Poltawski [Tue, 1 Jul 2014 12:37:56 +0000 (13:37 +0100)]
Merge branch 'MDL-46161_files_reference_index' of git://github.com/davosmith/moodle
Conflicts:
lib/db/upgrade.php
version.php
Dan Poltawski [Tue, 1 Jul 2014 09:53:59 +0000 (10:53 +0100)]
Merge branch 'MDL-46093' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 1 Jul 2014 09:39:14 +0000 (10:39 +0100)]
Merge branch 'wip_MDL-46099_m28_userglobal' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 1 Jul 2014 09:37:50 +0000 (10:37 +0100)]
Merge branch 'MDL-32450_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 1 Jul 2014 09:12:52 +0000 (10:12 +0100)]
Merge branch 'MDL-40457-question_bank_plugins_columns' of git://github.com/MorrisR2/moodle
Marina Glancy [Tue, 1 Jul 2014 07:28:54 +0000 (15:28 +0800)]
MDL-46147 modinfo: performance improvement for course page (check filterall)
Damyon Wiese [Thu, 26 Jun 2014 04:15:37 +0000 (12:15 +0800)]
MDL-46147 modinfo: performance improvement for course page
This is a big win in a specific situation, ie filters enabled for content+headings,
and no activity descriptions visible on the course page.
Frederic Massart [Tue, 1 Jul 2014 03:20:33 +0000 (11:20 +0800)]
MDL-42393 calendar: Preventing open/close loop in events overlay
Sam Hemelryk [Mon, 30 Jun 2014 23:27:53 +0000 (11:27 +1200)]
Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Mon, 30 Jun 2014 21:06:12 +0000 (09:06 +1200)]
Merge branch 'MDL-40805-master' of git://github.com/lameze/moodle
Petr Skoda [Mon, 23 Jun 2014 22:48:28 +0000 (10:48 +1200)]
MDL-46099 session: fix use of references for session globals
This reverses the references used for global $USER and $SESSION,
the reason is that PHP does not allow references to references.
$USER is a reference to $GLOBALS['USER'] which means we cannot
put any references to it. Solution is to store the current user and session
objects in $GLOBALS['USER'] and $GLOBALS['SESSIOn'] are reference
them in $_SESSION.
This patch makes the session code behave the same way in CLI,
phpunit and normal web requests - this allows use to finally
unit test most aspects of the session code in Moodle.
Sam Hemelryk [Mon, 30 Jun 2014 20:33:13 +0000 (08:33 +1200)]
Merge branch 'MDL-46118_master' of git://github.com/dmonllao/moodle
Mark Nelson [Mon, 23 Jun 2014 20:28:19 +0000 (13:28 -0700)]
MDL-32450 editor_tinymce: documented removal of DragMath
Mark Nelson [Mon, 23 Jun 2014 20:34:48 +0000 (13:34 -0700)]
MDL-32450 editor_tinymce: removed DragMath from the 'customtoolbar' setting
Dan Poltawski [Mon, 30 Jun 2014 14:12:30 +0000 (15:12 +0100)]
Merge branch 'wip-mdl-45641' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 30 Jun 2014 14:08:59 +0000 (15:08 +0100)]
Merge branch 'MDL-42467_database' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 30 Jun 2014 12:27:14 +0000 (13:27 +0100)]
Merge branch 'MDL-45833_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 30 Jun 2014 10:45:29 +0000 (11:45 +0100)]
Merge branch 'MDL-46044-master' of git://github.com/damyon/moodle
Heiko Schach [Tue, 24 Jun 2014 12:45:24 +0000 (15:45 +0300)]
MDL-46063 feedback: Fix user pictures
Dan Poltawski [Mon, 30 Jun 2014 08:24:39 +0000 (09:24 +0100)]
Merge branch 'MDL-41663-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 30 Jun 2014 07:55:35 +0000 (08:55 +0100)]
Merge branch 'MDL-40228-master' of git://github.com/FMCorz/moodle
Frederic Massart [Mon, 30 Jun 2014 02:15:12 +0000 (10:15 +0800)]
MDL-16474 scale: Allow scales with 1 item
Eric Merrill [Mon, 30 Jun 2014 02:28:14 +0000 (22:28 -0400)]
MDL-42071 caching Support for clustered memcache caching
For stores where there is a very high rate of sets compared to gets, it
is beneficial to retrieve from the local server, skipping the network
overhead, at the expense of having to set many severs when a key is set.
This patch adds a memcache option to enable clustering. When on, only
one "server" is allowed, which will be where fetches are from, while
sets/updates/deletes/purges will occur to the all the servers in the
"set server" list.
To run unit tests, define TEST_CACHESTORE_MEMCACHE_TESTSERVERS with
multiple (return delimited) servers.
Eric Merrill [Thu, 1 May 2014 21:00:26 +0000 (17:00 -0400)]
MDL-42071 caching Support for clustered memcached caching
For stores where there is a very high rate of sets compared to gets, it
is beneficial to retrieve from the local server, skipping the network
overhead, at the expense of having to set many severs when a key is set.
This patch adds a memcached option to enable clustering. When on, only
one "server" is allowed, which will be where fetches are from, while
sets/updates/deletes/purges will occur to the all the servers in the
"set server" list.
To run unit tests, define TEST_CACHESTORE_MEMCACHED_TESTSERVERS with
multiple (return delimited) servers.
Ray Morris [Tue, 11 Mar 2014 14:16:33 +0000 (09:16 -0500)]
MDL-40457 Question Bank: Allow plugins to add columns to question bank view
Allows plugins to add columns to the question bank view by extending core_question\bank\column_base
Columns to display are set in $CFG->questionbankcolumns. Columns are namespaced and autoloaded to support this.
Mark Nelson [Thu, 19 Jun 2014 01:54:44 +0000 (18:54 -0700)]
MDL-32450 upgrade: do not remove DragMath settings if the files still exist
Petr Skoda [Thu, 1 May 2014 06:00:15 +0000 (14:00 +0800)]
MDL-32450 delete Dragmath plugin and library because it is not compatible with GPL
AMOS bot [Sun, 29 Jun 2014 00:42:43 +0000 (00:42 +0000)]
Automatically generated installer lang files
Tim Hunt [Sun, 22 Jun 2014 10:03:03 +0000 (11:03 +0100)]
MDL-46093 quiz review should default to showing everything on one page
... as long as the quiz is not too big. At the moment, that limit is
set to 50 questions.
Davo Smith [Fri, 27 Jun 2014 08:38:38 +0000 (09:38 +0100)]
MDL-46161 switch the field order of the index on mdl_files_reference to improve performance of file_storage::search_references
NeillM [Tue, 24 Jun 2014 09:02:56 +0000 (10:02 +0100)]
MDL-45961 Customise this page button on user profile page only works correctly for users own profile
Rajesh Taneja [Mon, 23 Jun 2014 06:31:58 +0000 (14:31 +0800)]
MDL-45641 event: Ldap user_signup unit test added
Rajesh Taneja [Tue, 10 Jun 2014 02:38:11 +0000 (10:38 +0800)]
MDL-45641 event: Manually trigger event where needed.
Some places, user_created_user and user_updated_user
events should be triggred after profile data is saved.
Rajesh Taneja [Thu, 5 Jun 2014 05:41:20 +0000 (13:41 +0800)]
MDL-45641 event: Removed multiple user_updated event trigger
user_updated event was being triggred while
setting password, which is not correct. It now
trigger user_password_updated event. Few more
modifications done:
1. Correct event is being triggred.
2. Event is only triggred when password is chnaged.
3. Password is updated via single api.
4. Updated unit test
Rajesh Taneja [Fri, 23 May 2014 03:40:31 +0000 (11:40 +0800)]
MDL-45641 event: Option to trigger user event manually
On some pages full user data is not stored before user_created/
user_updated event is triggred. So giving option to trigger that
manually, so it can be triggred after all data is saved
Damyon Wiese [Fri, 27 Jun 2014 06:58:58 +0000 (14:58 +0800)]
MDL-46044 Assign: Add conditions to the inner query for performance
Damyon Wiese [Fri, 27 Jun 2014 06:14:14 +0000 (14:14 +0800)]
MDL-46044 Assign: Modify myhome query to only use the maxattempt from the submission
Using mismatches from the submissions/grades tables does not make much sense, we
should always only consider only the maxattempt from the submissions table.
Damyon Wiese [Thu, 19 Jun 2014 04:39:08 +0000 (12:39 +0800)]
MDL-46044 Assign: Move common setup to setUp method (share it for all of lib_test.php)
Damyon Wiese [Wed, 18 Jun 2014 08:57:48 +0000 (16:57 +0800)]
MDL-46044 Assign: Fix print_overview function when there are multiple attempts
Damyon Wiese [Thu, 19 Jun 2014 03:01:03 +0000 (11:01 +0800)]
MDL-46044 Assign: Update unit test to test multiple attempts on overview page
David Monllao [Wed, 25 Jun 2014 07:07:29 +0000 (15:07 +0800)]
MDL-46118 report_log: No results limit when downloading
David Monllao [Tue, 24 Jun 2014 04:50:53 +0000 (12:50 +0800)]
MDL-45833 event: Removing courseid as the context is higher than course context
Brian Barnes [Tue, 24 Jun 2014 02:41:11 +0000 (14:41 +1200)]
fixed download button
Yuliya [Fri, 2 May 2014 00:30:19 +0000 (12:30 +1200)]
MDL-45379 badges: removed unnecessary tables from renderers
Signed-off-by: Yuliya <yuliya.bozhko@gmail.com>
Signed-off-by: Brian Barnes <brian.barnes@totaralms.com>
Yuliya Bozhko [Wed, 25 Jun 2014 03:19:58 +0000 (15:19 +1200)]
MDL-46107 badges: Fix badges navigation and remove empty breadcrumbs on pages using Clean
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
Sam Hemelryk [Tue, 22 Apr 2014 02:08:39 +0000 (14:08 +1200)]
MDL-45209 course: fixed navbar when creating,editing courses
Ray Morris [Thu, 26 Jun 2014 17:09:38 +0000 (12:09 -0500)]
MDL-46163 Question bank: Category selector renders as nested form
Eloy Lafuente (stronk7) [Thu, 26 Jun 2014 08:35:37 +0000 (10:35 +0200)]
weekly release 2.8dev
Eloy Lafuente (stronk7) [Thu, 26 Jun 2014 08:35:27 +0000 (10:35 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 26 Jun 2014 08:06:20 +0000 (10:06 +0200)]
Revert " MDL-45044 filter_tex: properly escape excutable pathnames for Windows"
This reverts commit
f0da509835e3b8740c1693216a430dc3195cdb92.
Rajesh Taneja [Fri, 6 Jun 2014 08:25:04 +0000 (16:25 +0800)]
MDL-45889 behat: Allow admin config to set by shortname
Andrew Davis [Tue, 24 Jun 2014 03:53:34 +0000 (11:53 +0800)]
MDL-46036 mod_survey: added logic to prevent user trying to download when there are no results
Marina Glancy [Thu, 26 Jun 2014 02:26:59 +0000 (10:26 +0800)]
Merge branch 'wip-mdl-46061' of git://github.com/rajeshtaneja/moodle
Rajesh Taneja [Thu, 26 Jun 2014 01:59:49 +0000 (09:59 +0800)]
MDL-46061 behat: Fixed blur event problem for atto_image
atto_image look for blur event after changing width/height
Added a new step to get focus off the element, so this can
work.
Damyon Wiese [Wed, 25 Jun 2014 07:04:20 +0000 (15:04 +0800)]
MDL-45983 Atto equation editor: Exclude phantomjs from this behat test because it's buggy
Damyon Wiese [Wed, 25 Jun 2014 05:55:19 +0000 (13:55 +0800)]
Merge branch 'wip-mdl-43835' of https://github.com/rajeshtaneja/moodle
David Monllao [Wed, 25 Jun 2014 05:15:41 +0000 (13:15 +0800)]
MDL-42716 mod_assign: Lang str for the viewblinddetails capability
Rajesh Taneja [Tue, 24 Jun 2014 07:12:48 +0000 (15:12 +0800)]
MDL-43835 behat: Use proper step for navigation expansion
Rajesh Taneja [Wed, 25 Jun 2014 03:30:44 +0000 (11:30 +0800)]
MDL-43835 behat: Added new step to set field with xpath defined
Rajesh Taneja [Wed, 25 Jun 2014 03:29:40 +0000 (11:29 +0800)]
MDL-43835 behat: Fixed backup behat test
Disabling section, disables all checkboxes in section,
So we don't have to unset them manually