David Monllao [Mon, 15 Feb 2016 07:11:09 +0000 (15:11 +0800)]
Merge branch 'MDL-49807-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 15 Feb 2016 06:20:02 +0000 (14:20 +0800)]
MDL-52249 css: Recompile CSS
David Monllao [Mon, 15 Feb 2016 06:19:17 +0000 (14:19 +0800)]
Merge branch 'MDL-52249-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 15 Feb 2016 04:20:59 +0000 (12:20 +0800)]
Merge branch 'MDL-48634_master' of git://github.com/markn86/moodle
Andrew Nicols [Thu, 5 Feb 2015 00:42:00 +0000 (08:42 +0800)]
MDL-47365 mod_forum: Add permalink to forum posts
David Monllao [Thu, 11 Feb 2016 05:58:46 +0000 (13:58 +0800)]
weekly release 3.1dev
David Monllao [Thu, 11 Feb 2016 05:58:42 +0000 (13:58 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Rajesh Taneja [Wed, 10 Feb 2016 07:18:26 +0000 (15:18 +0800)]
MDL-51306 mod_folder: Use context_module to find details
renderable should not be used for extracting
details. Use cm to get context and dir information
Andrew Nicols [Wed, 10 Feb 2016 03:09:28 +0000 (11:09 +0800)]
MDL-52930 forum: Fix random test failure caused by passing of time
David Monllao [Wed, 10 Feb 2016 00:55:04 +0000 (08:55 +0800)]
Merge branch 'MDL-52766-master-mnet-url-length' of git://github.com/mudrd8mz/moodle
AMOS bot [Tue, 9 Feb 2016 16:03:56 +0000 (00:03 +0800)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Tue, 9 Feb 2016 11:08:40 +0000 (12:08 +0100)]
Merge branch 'MDL-52896-master-apd' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 9 Feb 2016 10:34:14 +0000 (10:34 +0000)]
Merge branch 'MDL-49620_availability_settings' of git://github.com/synergylearning/moodle
David Monllao [Tue, 9 Feb 2016 10:06:10 +0000 (18:06 +0800)]
Merge branch 'MDL-52930-master' of git://github.com/andrewnicols/moodle
Brendan Heywood [Tue, 2 Feb 2016 07:05:53 +0000 (18:05 +1100)]
MDL-52818 core: Added CFG->divertallemailsexcept config option
When $CFG->divertallemailsto is specified, this allows a list of email
or domain exceptions to be whitelisted enabling easier testing by groups
of testers who don't share a single email address.
Marina Glancy [Tue, 9 Feb 2016 09:47:14 +0000 (17:47 +0800)]
MDL-49807 mod_wiki: minimum heading level should always be <h3>
Mark Nelson [Mon, 8 Feb 2016 08:37:11 +0000 (16:37 +0800)]
MDL-48634 core: changes to automated tests to pass with changes
Mark Nelson [Mon, 25 Jan 2016 06:52:33 +0000 (14:52 +0800)]
MDL-48634 core_grades: added behat test for grade items form validation
Mark Nelson [Thu, 21 Jan 2016 05:04:02 +0000 (13:04 +0800)]
MDL-48634 core_form: added behat test for 'modgrade' validation
Mark Nelson [Tue, 19 Jan 2016 09:04:56 +0000 (17:04 +0800)]
MDL-48634 core: prevent change of grade values when necessary
Three additional checks have been added.
Once grades have been recorded for the activity/grade item -
1) Do not allow the grade type to be changed.
2) Do not allow the scale to be changed.
3) If we are using ratings do not allow the 'Maximum points'
value to be changed.
Also reordered form elements, removed form elements that
were not necessary, added and changed existing language
strings to improve the overall UI.
Dan Poltawski [Tue, 9 Feb 2016 09:43:21 +0000 (09:43 +0000)]
Merge branch 'MDL-52895-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 9 Feb 2016 06:45:29 +0000 (14:45 +0800)]
Merge branch 'MDL-52902-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 9 Feb 2016 05:37:14 +0000 (13:37 +0800)]
Merge branch 'MDL-52927' of https://github.com/mkassaei/moodle
David Monllao [Tue, 9 Feb 2016 04:24:24 +0000 (12:24 +0800)]
Merge branch 'MDL-51818_M30' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Tue, 9 Feb 2016 01:30:07 +0000 (02:30 +0100)]
Merge branch 'wip-mdl-52949' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 8 Feb 2016 23:45:19 +0000 (00:45 +0100)]
Merge branch 'MDL-52339-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 8 Feb 2016 23:30:02 +0000 (00:30 +0100)]
Merge branch 'MDL-52938-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 8 Feb 2016 21:57:45 +0000 (22:57 +0100)]
Merge branch 'MDL-52975-master-mnet-context' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 8 Feb 2016 21:55:07 +0000 (22:55 +0100)]
Merge branch 'MDL-52981-master' of https://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 8 Feb 2016 21:44:47 +0000 (22:44 +0100)]
Merge branch 'MDL-51075_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 8 Feb 2016 21:34:07 +0000 (22:34 +0100)]
Merge branch 'MDL-50310-master-random-glossary' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 8 Feb 2016 17:13:02 +0000 (17:13 +0000)]
Merge branch 'MDL-48778-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 8 Feb 2016 12:05:30 +0000 (13:05 +0100)]
Merge branch 'MDL-52983' of git://github.com/aolley/moodle
Andrew Nicols [Mon, 8 Feb 2016 06:17:51 +0000 (14:17 +0800)]
MDL-52249 theme_bootstrapbase: Remove dropdown-backdrop
Standard bootstrap adds a backdrop for touch-responsive clients.
Unfortunately the backdrop is not compatible with submenus.
The backdrop was only added in Bootstrap v2.3.1, and Moodle switched to
using the bootstrap JS in version 3.0.0.
David Monllao [Mon, 8 Feb 2016 06:10:39 +0000 (14:10 +0800)]
Merge branch 'MDL-50115-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 8 Feb 2016 05:47:06 +0000 (13:47 +0800)]
Merge branch 'm31_MDL-52637_Disable_Automatically_Enabling_TLS_Encryption' of https://github.com/scara/moodle
Simey Lameze [Mon, 8 Feb 2016 02:22:31 +0000 (10:22 +0800)]
MDL-48778 mod_assign: behat tests for group submission
Adam Olley [Wed, 3 Feb 2016 11:58:44 +0000 (22:28 +1030)]
MDL-52983 excel output: avoid single quote on end of sheet name
This change resolves a problem where a long sheet name, which gets
trimmed down with substr($name, 0, 31), could result in a sheet name
with a single quote on the end because the quote removal was done before
the substr.
David Monllao [Mon, 8 Feb 2016 03:23:34 +0000 (11:23 +0800)]
Merge branch 'MDL-51306' of https://github.com/andrewhancox/moodle
Eric Merrill [Wed, 21 Jan 2015 14:48:15 +0000 (09:48 -0500)]
MDL-48778 assign: Use proper latest attempt for quickgrading prechecks
The code that stored lastmodified in gradingtable used a different
method to produce it than the processor used to generate the check
value. Fix that and also check that the attempt number has not changed.
David Monllao [Mon, 8 Feb 2016 01:02:41 +0000 (09:02 +0800)]
Merge branch 'MDL-51723-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Fri, 29 Jan 2016 07:16:23 +0000 (15:16 +0800)]
MDL-44087 mod_forum: Move forum digest to new processor
AMOS bot [Fri, 5 Feb 2016 16:03:58 +0000 (00:03 +0800)]
Automatically generated installer lang files
Damyon Wiese [Wed, 19 Aug 2015 07:00:56 +0000 (15:00 +0800)]
MDL-48634 grades: Remove hardcoded hack in grade book
This was testing specifically for mod_assign - now we can test to see if
an activity provides it's own rescaling function.
Eloy Lafuente (stronk7) [Tue, 18 Aug 2015 02:05:23 +0000 (04:05 +0200)]
MDL-48634 assign: Improve related feature to better cover new code.
This does:
- split the existing scenarion into background + 2 scenarions (yes and no).
- get rid of @javascript
- fix some whitespace
- add 2 more scenarios to verify the new server-side validation rule.
Damyon Wiese [Thu, 13 Aug 2015 04:16:21 +0000 (12:16 +0800)]
MDL-48634 grades: Make the rescaling option required if maxgrade changes
Damyon Wiese [Wed, 15 Apr 2015 11:57:28 +0000 (07:57 -0400)]
MDL-48634 grades: Add an option to rescale when changing the maxgrade
Andrew Nicols [Fri, 5 Feb 2016 06:32:47 +0000 (14:32 +0800)]
MDL-52930 mod_forum: Add get_unmailed_posts tests
Josh Marshall [Thu, 29 Oct 2015 05:21:13 +0000 (15:51 +1030)]
MDL-52930 forum: Correct get_unmailed_posts logic
David Monllao [Tue, 2 Feb 2016 04:34:59 +0000 (12:34 +0800)]
MDL-51075 filter_glossary: Fix popup position when no popups
Thanks to Andrew Nicols for cleaning my eyes.
Andrew Nicols [Tue, 2 Feb 2016 07:37:17 +0000 (15:37 +0800)]
MDL-52339 question: Fix question attempt removal for MySQL
Derived table support was altered in MySQL 5.7 changing the way in which
DELETE FROM works in some cases.
This change modifies the way in which deletion occurs by selecting all IDs
and batching them into groups of 1000.
David Mudrák [Thu, 4 Feb 2016 22:44:15 +0000 (23:44 +0100)]
MDL-50310 glossary: Fix restore of random glossary entry block
When restoring the random glossary entry block, we need to check that
the associated glossary has also been included in the backup and is
being restored. If not, we must invalidate the block configuration.
Before this patch, the block configuration was not invalidated.
Additionally, as a result of MDL-20131, the block configuration also
contains the course id of the associated glossary (which by the way does
not seem to be a wise choice, but I may be missing something). So we
need to remap this course id as well to avoid mismatch.
Matteo Scaramuccia [Sat, 16 Jan 2016 20:12:03 +0000 (21:12 +0100)]
MDL-52637 mail: Disabled automatic TLS encryption.
David Mudrák [Tue, 2 Feb 2016 20:01:45 +0000 (21:01 +0100)]
MDL-52975 mnet: Set system context on the MNet SSO landing page
Without the context being explicitly set, debugging warning can be
displayed in certain rare situations.
David Mudrák [Tue, 2 Feb 2016 21:34:04 +0000 (22:34 +0100)]
MDL-52766 mnet: Support MNet peer URLs longer than 64 characters
The commonName in SSL certificate is limited to 64 characters as per
RFC 5280 (https://www.ietf.org/rfc/rfc5280.txt). We respect that limit
when generating the CN attribute from the site's $CFG->wwwroot. But then
we did not respect it when comparing the common name with the peer's
URL so the certificate was not considered valid.
Davo Smith [Thu, 4 Feb 2016 15:21:02 +0000 (15:21 +0000)]
MDL-49620 availability: plugins can have global settings
Dan Poltawski [Thu, 28 Jan 2016 14:55:56 +0000 (14:55 +0000)]
MDL-50115 grunt: provide a --root option to set base path
Windows users are not able to run grunt on a subpath due to platform
restrictions. So we provide this option to provide a workaround for that.
Thanks to Ty Delean who proposed this idea.
M Kassaei [Mon, 1 Feb 2016 12:04:10 +0000 (12:04 +0000)]
MDL-52927 qtype ddwtos and ddimageortext focus using keyboard
David Monllao [Thu, 4 Feb 2016 06:30:03 +0000 (14:30 +0800)]
weekly release 3.1dev
David Monllao [Thu, 4 Feb 2016 06:30:00 +0000 (14:30 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
AMOS bot [Wed, 3 Feb 2016 16:04:08 +0000 (00:04 +0800)]
Automatically generated installer lang files
sam marshall [Wed, 3 Feb 2016 10:25:27 +0000 (10:25 +0000)]
MDL-52981 Unit tests: Reset global after test
Juan Leyva [Tue, 26 Jan 2016 08:40:09 +0000 (09:40 +0100)]
MDL-52895 webservice: Fix capability checks
Dan Poltawski [Wed, 3 Feb 2016 09:44:27 +0000 (09:44 +0000)]
Merge branch 'wip-MDL-52715-master-additional' of git://github.com/abgreeve/moodle
David Monllao [Wed, 3 Feb 2016 05:44:41 +0000 (13:44 +0800)]
Merge branch 'MDL-52899' of git://github.com/timhunt/moodle
Adrian Greeve [Thu, 21 Jan 2016 02:43:26 +0000 (10:43 +0800)]
MDL-52715 lib: Clean up of comments and variable names.
Andrew Hancox [Wed, 7 Oct 2015 10:46:45 +0000 (11:46 +0100)]
MDL-51306 mod_folder: Add button to download entire folder.
David Monllao [Tue, 2 Feb 2016 09:40:39 +0000 (17:40 +0800)]
Merge branch 'wip-MDL-51283-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Thu, 14 Jan 2016 07:20:57 +0000 (15:20 +0800)]
MDL-51283 core_tag: Allow each tag area to set 'showstandard'
Marina Glancy [Sun, 10 Jan 2016 07:28:36 +0000 (15:28 +0800)]
MDL-51283 core_tag: change tagtype to isstandard
Change 'official' to 'standard' in UI
Dan Poltawski [Tue, 2 Feb 2016 08:18:06 +0000 (08:18 +0000)]
Merge branch 'wip-mdl-42395' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Tue, 2 Feb 2016 07:58:48 +0000 (15:58 +0800)]
MDL-42395 mod_assign: Single feedback is always visible
Single feedback is always visible, so no need to click to expand
David Monllao [Tue, 2 Feb 2016 05:57:43 +0000 (13:57 +0800)]
Merge branch 'MDL-49817-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 2 Feb 2016 04:12:03 +0000 (12:12 +0800)]
Merge branch 'MDL-52873-master-modgradeid' of git://github.com/mudrd8mz/moodle
David Monllao [Tue, 2 Feb 2016 02:55:59 +0000 (10:55 +0800)]
Merge branch 'MDL-52137-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Tue, 2 Feb 2016 02:53:47 +0000 (10:53 +0800)]
MDL-52938 mod_forum: check global setting to track forum posts
Dan Poltawski [Mon, 1 Feb 2016 11:17:02 +0000 (11:17 +0000)]
Merge branch 'MDL-42395_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 1 Feb 2016 11:09:42 +0000 (11:09 +0000)]
MDL-45740 choice: version bump
Dan Poltawski [Mon, 1 Feb 2016 11:02:22 +0000 (11:02 +0000)]
Merge branch 'MDL-45740_master' of git://github.com/markn86/moodle
Mark Nelson [Fri, 29 Jan 2016 08:05:54 +0000 (16:05 +0800)]
MDL-45740 mod_choice: fixed remaining issues
Dan Poltawski [Mon, 1 Feb 2016 10:27:28 +0000 (10:27 +0000)]
Merge branch 'wip-mdl-52932-m' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 1 Feb 2016 09:49:20 +0000 (09:49 +0000)]
Merge branch 'MDL-52940_master' of git://github.com/markn86/moodle
David Monllao [Mon, 1 Feb 2016 09:19:59 +0000 (17:19 +0800)]
Merge branch 'MDL-51704-master' of git://github.com/dpalou/moodle
David Monllao [Tue, 19 Jan 2016 08:15:37 +0000 (16:15 +0800)]
MDL-52715 js: Merge M.str and clean memory
David Monllao [Tue, 19 Jan 2016 02:21:46 +0000 (10:21 +0800)]
MDL-52715 ws: Fragments WS using fragment requires properly.
Adrian Greeve [Mon, 11 Jan 2016 07:54:43 +0000 (15:54 +0800)]
MDL-52715 lib: Addition of new requirements class.
This adds a fragment requirements class to allow plugins
to register JavaScript to be used in an mform.
David Monllao [Mon, 1 Feb 2016 05:55:57 +0000 (13:55 +0800)]
Merge branch 'MDL-52261_master_file_not_found' of git://github.com/BenKelada/moodle
David Monllao [Mon, 1 Feb 2016 05:46:18 +0000 (13:46 +0800)]
Merge branch 'MDL-52913_master' of git://github.com/marxjohnson/moodle
Mark Nelson [Mon, 1 Feb 2016 04:37:27 +0000 (12:37 +0800)]
MDL-52940 core_backup: prevent always displaying logs
David Monllao [Mon, 1 Feb 2016 03:28:40 +0000 (11:28 +0800)]
Merge branch 'MDL-52831-master-emptynames' of git://github.com/mudrd8mz/moodle
Rajesh Taneja [Mon, 1 Feb 2016 03:14:20 +0000 (11:14 +0800)]
MDL-52949 behat: Use hover step and not click step
Message delete link is visible on hover
Click event can fail randomly.
Andrew Nicols [Thu, 28 Jan 2016 06:32:19 +0000 (14:32 +0800)]
MDL-51723 ldap: Normalise the user objectclass
lazydaisy [Sun, 31 Jan 2016 02:31:14 +0000 (02:31 +0000)]
MDL-51818 theme_bootstrapbase: compiled moodle.css
lazydaisy [Sun, 18 Oct 2015 23:20:03 +0000 (00:20 +0100)]
MDL-51818 theme_bootstrapbase: Float context-header button-group LEFT
Mark Johnson [Thu, 28 Jan 2016 09:52:27 +0000 (09:52 +0000)]
MDL-52913 behat: Abort database transactions on exception.
Mark Nelson [Fri, 29 Jan 2016 09:55:21 +0000 (17:55 +0800)]
MDL-42395 mod_assign: build YUI module and fixed lint errors
Rushikesh [Sat, 16 Jan 2016 09:26:10 +0000 (14:56 +0530)]
MDL-42395 mod_assign: Showing the most recent feedback
David Monllao [Fri, 29 Jan 2016 06:36:50 +0000 (14:36 +0800)]
weekly release 3.1dev
David Monllao [Fri, 29 Jan 2016 06:36:47 +0000 (14:36 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Stephen Bourget [Mon, 4 Jan 2016 23:33:12 +0000 (18:33 -0500)]
MDL-45740 choice: add new events