Sam Hemelryk [Sun, 13 Jul 2014 23:55:02 +0000 (11:55 +1200)]
Merge branch 'wip-MDL-46247-master' of https://github.com/mackensen/moodle
Sam Hemelryk [Sun, 13 Jul 2014 22:50:42 +0000 (10:50 +1200)]
MDL-46138 post integratino phpdoc fixes
Sam Hemelryk [Sun, 13 Jul 2014 22:39:54 +0000 (10:39 +1200)]
Merge branch 'MDL-46138-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 13 Jul 2014 22:32:28 +0000 (10:32 +1200)]
Merge branch 'wip-MDL-46280-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Sun, 13 Jul 2014 22:21:13 +0000 (10:21 +1200)]
Merge branch 'MDL-22469-master' of https://github.com/StudiUM/moodle
Sam Hemelryk [Sun, 13 Jul 2014 22:12:16 +0000 (10:12 +1200)]
Merge branch 'MDL-31089_master' of git://github.com/dmonllao/moodle
David Monllao [Mon, 30 Jun 2014 08:55:57 +0000 (16:55 +0800)]
MDL-31089 mod_forum: Filtering non-visible groups
Simey Lameze [Fri, 11 Jul 2014 04:58:26 +0000 (12:58 +0800)]
MDL-45562 blog: fixed issues when creating/editing an external blog.
Damyon Wiese [Fri, 11 Jul 2014 01:43:32 +0000 (09:43 +0800)]
MDL-46138 tasks: The adhoc task is being too helpful with json_encoding/decoding.
Gilles-Philippe Leblanc [Mon, 7 Jul 2014 21:14:40 +0000 (17:14 -0400)]
MDL-22469 auth_cas: CAS module : parameter authCAS=NOCAS not properly handled
Eloy Lafuente (stronk7) [Thu, 10 Jul 2014 17:15:18 +0000 (19:15 +0200)]
weekly release 2.8dev
Eloy Lafuente (stronk7) [Thu, 10 Jul 2014 17:15:06 +0000 (19:15 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
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.
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.
Russell Smith [Wed, 9 Jul 2014 07:47:19 +0000 (17:47 +1000)]
MDL-46193 phpunit: Replace value in component config.
There are two phpunit.xml build locations, one for overall
and another for individual components. To reduce id changes
when running different components, we use the same initial ID
in all component files when building.
Damyon Wiese [Thu, 10 Jul 2014 03:35:47 +0000 (11:35 +0800)]
MDL-46148 questions: Added missing allow_commit for transaction
Damyon Wiese [Thu, 10 Jul 2014 01:57:06 +0000 (09:57 +0800)]
Merge branch 'MDL-19270_master' of https://github.com/nadavkav/moodle
Conflicts:
lib/graphlib.php
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.
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.
Nadav Kavalerchik [Wed, 9 Jul 2014 11:57:31 +0000 (14:57 +0300)]
MDL-19270 - Quiz graph - Fix reverse display of Hebrew legend text in RTL mode
Tim Hunt [Wed, 9 Jul 2014 11:56:18 +0000 (12:56 +0100)]
MDL-46148 qtype_calculated: removed unused method.
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.
David Mudrák [Wed, 9 Jul 2014 08:21:16 +0000 (10:21 +0200)]
MDL-46223 Improve the display of marking guide validation message
Dan Poltawski [Wed, 9 Jul 2014 07:22:18 +0000 (08:22 +0100)]
MDL-46227 fix typo
Dan Poltawski [Thu, 3 Jul 2014 13:30:36 +0000 (14:30 +0100)]
MDL-44605 calendar: improved returnurl validation
Now we will only redirect to a local url (though sesskey was
already preventing this redirect from being open)
Eloy Lafuente (stronk7) [Tue, 8 Jul 2014 22:51:22 +0000 (00:51 +0200)]
Merge branch '41502-28' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 8 Jul 2014 19:07:56 +0000 (21:07 +0200)]
MDL-42609 course: management default missing bits
With the previous commit in this issue, now the course management
UI defaults to show the "default category" courses.
But some bits were missing in order to make that default behavior
fully equivalent with the manual navigation to that category.
This patch:
- Adds the missing categoryid url param, used by some of the options
in the UI, like sorting, that was completely broken.
- Sets the context to the default category, previously was being set to
system context, incorrectly if now we are defaulting to a category.
That way everything is 100% the same than when we land to the category manually.
Eloy Lafuente (stronk7) [Tue, 8 Jul 2014 18:31:25 +0000 (20:31 +0200)]
Merge branch '42609-28' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 8 Jul 2014 18:28:58 +0000 (20:28 +0200)]
Merge branch 'MDL-43849_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 8 Jul 2014 14:31:50 +0000 (15:31 +0100)]
Merge branch 'MDL-45599-master-addons' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 8 Jul 2014 13:17:56 +0000 (14:17 +0100)]
Merge branch 'MDL-44492' of git://github.com/timhunt/moodle
Tim Hunt [Wed, 2 Jul 2014 18:12:28 +0000 (19:12 +0100)]
MDL-44492 quiz: fix hilighting of graded attempt
In various places, when showing several attempts, we try to hilight the
most significant one (the one that gave the final grade if the quiz is
set to first/last/best attempt). That was not working because the table
zebra stripes were a more specific rule.
Also, the colour was inconsistent, not nice, and not very bootstrapy, so
I changed it.
Tim Hunt [Tue, 1 Jul 2014 15:34:33 +0000 (16:34 +0100)]
MDL-44492 quiz reports: revert some style overrides.
But add one more. This makes Clean theme look a lot better.
Tim Hunt [Thu, 3 Jul 2014 16:37:35 +0000 (17:37 +0100)]
MDL-44492 Rough unit test for the report SQL.
We really ought to test more cases, but this hits one of the most tricky cases.
Tim Hunt [Tue, 1 Jul 2014 16:43:18 +0000 (17:43 +0100)]
MDL-44492 quiz reports: make show only graded attempt work.
It needs to only affect finished attempts, and the wording needs to be
modified to make it clear that is what it does.
Frederic Massart [Thu, 8 May 2014 07:58:56 +0000 (15:58 +0800)]
MDL-45471 javascript: Escape content of exception dialogs
Dan Poltawski [Tue, 8 Jul 2014 10:28:58 +0000 (11:28 +0100)]
Merge branch 'MDL-45381_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 8 Jul 2014 09:50:55 +0000 (10:50 +0100)]
Merge branch 'MDL-45596-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 8 Jul 2014 02:11:40 +0000 (10:11 +0800)]
MDL-43948 forms: setting types to filemanager and editor elements
Dan Poltawski [Tue, 8 Jul 2014 07:33:57 +0000 (08:33 +0100)]
MDL-46231 navigation: en_fix behat changes
Dan Poltawski [Tue, 8 Jul 2014 07:32:32 +0000 (08:32 +0100)]
Merge branch 'MDL-46231-master-en_fix' of git://github.com/mudrd8mz/moodle
Helen Foster [Tue, 8 Jul 2014 07:02:06 +0000 (09:02 +0200)]
MDL-45599 Fix tiny grammatical errors in the plugin installer
Skylar Kelty [Wed, 2 Jul 2014 07:35:24 +0000 (08:35 +0100)]
MDL-46227 Fix XSS in scheduled tasks
David Mudrák [Mon, 7 Jul 2014 07:52:37 +0000 (09:52 +0200)]
MDL-46223 Improve the marking guide output
David Mudrák [Mon, 7 Jul 2014 04:38:47 +0000 (06:38 +0200)]
MDL-46223 Improve the rubric output
Sam Hemelryk [Tue, 8 Jul 2014 03:35:59 +0000 (15:35 +1200)]
MDL-46059 mod_lti: fixed invalid decimals attribute
Sam Hemelryk [Tue, 8 Jul 2014 03:15:12 +0000 (15:15 +1200)]
Merge branch 'wip-MDL-46059-master' of git://github.com/abgreeve/moodle
Marina Glancy [Tue, 8 Jul 2014 02:33:25 +0000 (10:33 +0800)]
MDL-46280 filter_activitynames: sort activities by length in reverse order
Sam Hemelryk [Tue, 8 Jul 2014 02:27:47 +0000 (14:27 +1200)]
Merge branch 'MDL-46016_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 8 Jul 2014 02:14:51 +0000 (14:14 +1200)]
MDL-19270 core_text: added unit tests for strrev
Sam Hemelryk [Tue, 8 Jul 2014 01:53:40 +0000 (13:53 +1200)]
Merge branch 'MDL-19270_master' of https://github.com/nadavkav/moodle
Sam Hemelryk [Tue, 8 Jul 2014 01:38:04 +0000 (13:38 +1200)]
Merge branch 'MDL-46200-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 8 Jul 2014 01:26:36 +0000 (13:26 +1200)]
Merge branch 'mdl45982-master' of https://github.com/tlock/moodle
Sam Hemelryk [Tue, 8 Jul 2014 01:10:30 +0000 (13:10 +1200)]
Merge branch 'm28_MDL-46144' of https://github.com/totara/moodle
Sam Hemelryk [Tue, 8 Jul 2014 01:10:24 +0000 (13:10 +1200)]
Merge branch 'MDL-46193' of git://github.com/mr-russ/moodle
Eloy Lafuente (stronk7) [Tue, 8 Jul 2014 00:13:35 +0000 (02:13 +0200)]
Merge branch '46208-28' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Mon, 7 Jul 2014 23:43:09 +0000 (11:43 +1200)]
Merge branch 'MDL-46212' of git://github.com/timhunt/moodle
Conflicts:
question/type/calculated/question.php
Sam Hemelryk [Mon, 7 Jul 2014 22:36:10 +0000 (10:36 +1200)]
Merge branch 'm28_MDL-46225' of https://github.com/totara/moodle
Sam Hemelryk [Mon, 7 Jul 2014 22:34:28 +0000 (10:34 +1200)]
Merge branch 'MDL-46240-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 7 Jul 2014 22:31:54 +0000 (00:31 +0200)]
Merge branch 'wip_MDL-45945_m28_mssqlcol' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 7 Jul 2014 21:52:41 +0000 (09:52 +1200)]
MDL-45678 cache: renamed new cache and better comments
Sam Hemelryk [Mon, 7 Jul 2014 21:42:35 +0000 (09:42 +1200)]
Merge branch 'MDL-45678-006-master' of https://github.com/dbezborodovrp/moodle
Sam Hemelryk [Mon, 7 Jul 2014 21:37:08 +0000 (09:37 +1200)]
Merge branch 'wip_MDL-46126_m28_passnulls' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 7 Jul 2014 21:28:20 +0000 (09:28 +1200)]
Merge branch 'MDL-43347-master' of https://github.com/mackensen/moodle
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.
Charles Fulton [Thu, 3 Jul 2014 18:08:16 +0000 (11:08 -0700)]
MDL-46247 auth: Add new language for unauthorised external user
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.
Nadav Kavalerchik [Sun, 6 Jul 2014 15:46:45 +0000 (18:46 +0300)]
MDL-19270 - Quiz graph - Fix reverse display of Hebrew legend text in RTL mode
Helen Foster [Fri, 4 Jul 2014 20:32:38 +0000 (22:32 +0200)]
MDL-46231 Merge English strings from the en_fix language pack
Dan Poltawski [Fri, 4 Jul 2014 13:48:10 +0000 (14:48 +0100)]
MDL-46200 fix missing space in failed login message
Dan Poltawski [Fri, 4 Jul 2014 13:33:39 +0000 (14:33 +0100)]
MDL-46240 atto_collapse: fix icon url
David Mudrák [Fri, 4 Jul 2014 09:34:34 +0000 (11:34 +0200)]
MDL-45599 Stop using the 'add-on' term
We now call them all as just 'plugins' for consistency. There where we need to
explicitly distinguish the source of the plugin, we say they are 'additional
plugins' on contrary to 'standards plugins' coming with the core.
David Mudrák [Fri, 4 Jul 2014 08:36:53 +0000 (10:36 +0200)]
MDL-45599 Remove string editingnoncorelangfile from core_admin
This string mentions 'add-on' and has been greylisted in AMOS since 2.0. The
usage of it was removed in 00b41d.
Adrian Greeve [Thu, 19 Jun 2014 07:17:47 +0000 (15:17 +0800)]
MDL-46059 mod_lti: Changed LTI table column grade to an int.
Russell Smith [Tue, 24 Jun 2014 09:25:51 +0000 (19:25 +1000)]
MDL-46193 phpunit: Use random starting value on initialization.
Damien Bezborodov [Wed, 25 Jun 2014 08:03:10 +0000 (17:33 +0930)]
MDL-45678 assignsubmission_comments: Improve performance for permissions checking
Petr Skoda [Fri, 4 Jul 2014 04:28:59 +0000 (16:28 +1200)]
MDL-46126 upgrade: fix bogus nulls in user.password before changing precission
Note: there is no need to deal with Oracle empty strings here
because only MySQL running in non-strict mode is affected.
Frederic Massart [Fri, 4 Jul 2014 03:48:39 +0000 (11:48 +0800)]
MDL-45596 roles: Escape filter value before using it in form field
Petr Skoda [Fri, 4 Jul 2014 03:04:50 +0000 (15:04 +1200)]
MDL-45945 mssql: force default database collation in all tables including temp table
AMOS bot [Fri, 4 Jul 2014 00:44:09 +0000 (00:44 +0000)]
Automatically generated installer lang files
Mark Nelson [Mon, 30 Jun 2014 02:23:17 +0000 (19:23 -0700)]
MDL-46016 auth_shibboleth: updated misleading comment
Also generated a random string for the password field in case it is ever used.
Sam Hemelryk [Thu, 3 Jul 2014 21:09:15 +0000 (09:09 +1200)]
MDL-42609 course: management page now selected default category initially
Sam Hemelryk [Thu, 3 Jul 2014 21:29:03 +0000 (09:29 +1200)]
MDL-41502 course: removed classes and files deprecated in 2.6
Sam Hemelryk [Tue, 1 Jul 2014 03:40:28 +0000 (15:40 +1200)]
MDL-46208 cachestore_mongo: fixed invalid collection name use
Tim Hunt [Mon, 30 Jun 2014 18:09:54 +0000 (19:09 +0100)]
MDL-46212 questions: add {} whenver vars are put into "" strings
Having had one subtle bug cased be this, I decided to do a search and
fix all of these.