Dan Poltawski [Mon, 30 Nov 2015 13:37:47 +0000 (13:37 +0000)]
Merge branch 'MDL-51718-set-scheme' of https://github.com/brendanheywood/moodle
Dan Poltawski [Mon, 30 Nov 2015 13:20:35 +0000 (13:20 +0000)]
Merge branch 'MDL-52042-master' of git://github.com/ryanwyllie/moodle
Dan Poltawski [Mon, 30 Nov 2015 12:23:09 +0000 (12:23 +0000)]
Merge branch 'MDL-51900_master' of https://github.com/jinhofer/moodle
Dan Poltawski [Mon, 30 Nov 2015 11:27:52 +0000 (11:27 +0000)]
Merge branch 'MDL-52283-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 30 Nov 2015 10:23:07 +0000 (10:23 +0000)]
Merge branch 'MDL-52332-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 30 Nov 2015 07:52:46 +0000 (15:52 +0800)]
Merge branch 'MDL-51204_lang_coding_style' of git://github.com/andyjdavis/moodle
Conflicts:
lang/en/deprecated.txt
lang/en/grades.php
David Monllao [Mon, 30 Nov 2015 07:45:44 +0000 (15:45 +0800)]
Merge branch 'MDL-35982-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Fri, 27 Nov 2015 00:49:04 +0000 (08:49 +0800)]
MDL-52332 calendar: load settings using API
Rajesh Taneja [Tue, 24 Nov 2015 08:24:24 +0000 (16:24 +0800)]
MDL-52279 core_lib: Remove php4 style constructor
filterobject is called from core and as it's
using php4 style constructor, global USER is
not set properly because of deprecation warning
jinhofer [Tue, 27 Oct 2015 15:05:20 +0000 (10:05 -0500)]
MDL-51900 grade/report/singleview: Added ctrl+arrow navigation
Also, added functionality for tab to traverse down the columns and
shift+tab to traverse up the columns.
Tony Levi [Mon, 3 Aug 2015 06:46:03 +0000 (16:16 +0930)]
MDL-52283 core: password_hash() deprecation in PHP7
Dan Poltawski [Fri, 30 Oct 2015 15:15:07 +0000 (15:15 +0000)]
MDL-35982 behat: delete blog entry coverage
Dan Poltawski [Fri, 30 Oct 2015 14:37:24 +0000 (14:37 +0000)]
MDL-35982 blog: improve the delete entry confirmation string
So that there is more context about what is being deleted.
Dan Poltawski [Fri, 30 Oct 2015 14:22:39 +0000 (14:22 +0000)]
MDL-35982 blog: reorder blog delete confirmation
Improves accessibility to be ordered logically in page
Dan Poltawski [Fri, 30 Oct 2015 14:14:24 +0000 (14:14 +0000)]
MDL-35982 blog: prevent index throwing errors with 0 courseid
Regression from MDL-49845 where Dave made the page not handle courseid = 0
and so now some urls will send you back to a db error..
David Monllao [Thu, 26 Nov 2015 03:02:40 +0000 (11:02 +0800)]
weekly on-sync release 3.1dev
David Monllao [Thu, 26 Nov 2015 03:02:38 +0000 (11:02 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
AMOS bot [Wed, 25 Nov 2015 16:04:22 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Wed, 25 Nov 2015 11:22:17 +0000 (11:22 +0000)]
Merge branch 'MDL-52291' of git://github.com/stronk7/moodle
Frederic Massart [Wed, 25 Nov 2015 05:03:25 +0000 (13:03 +0800)]
MDL-52160 navigation: Mark category and module settings nodes as branch
Eloy Lafuente (stronk7) [Tue, 24 Nov 2015 23:19:30 +0000 (00:19 +0100)]
MDL-52291 questions: fix upgrade from 2.5 and earlier
Because of some changes performed to the multichoice qtype
for Moodle 2.6, older sites are not able to upgrade properly.
This commits does introduce DB introspection to decide which
table and column names must be used. Nasty but enough.
Note MDL-52298 has been created about to avoid/minimize the
chances of this happening again.
AMOS bot [Tue, 24 Nov 2015 16:04:12 +0000 (00:04 +0800)]
Automatically generated installer lang files
David Monllao [Tue, 24 Nov 2015 09:03:06 +0000 (17:03 +0800)]
Merge branch 'MDL-44330' of git://github.com/NeillM/moodle
David Monllao [Tue, 24 Nov 2015 08:53:18 +0000 (16:53 +0800)]
Merge branch 'MDL-45934-master' of git://github.com/danpoltawski/moodle
Neill Magill [Wed, 11 Nov 2015 13:06:31 +0000 (13:06 +0000)]
MDL-44330 Assign: Assignment grading may not display expected student
Before this patch it was possible for the student displayed on the grading page to
not be the student that the user selected to grade. This would occur if:
1) The user had the table ordered by a value that could be modified,
for example Last modified (submission), Grade, Last modified (grade)
2) Another user performed an action that was recorded in Moodle in the time
between the user generating the table and clicking on a grade link.
If a user did not notice a different user had been loaded it could result in them giving
a grade to the incorrect user.
This patch ensures that the state of the table is cached every time it is viewed by a user
who has the capability to grade.
Rajesh Taneja [Tue, 24 Nov 2015 03:16:44 +0000 (11:16 +0800)]
MDL-50163 behat: wait to ensure elements are placed properly by js.
Eloy Lafuente (stronk7) [Mon, 23 Nov 2015 18:29:35 +0000 (19:29 +0100)]
Merge branch 'MDL-52095_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 23 Nov 2015 18:26:57 +0000 (19:26 +0100)]
Merge branch 'MDL-52185-master' of git://github.com/danpoltawski/moodle
AMOS bot [Mon, 23 Nov 2015 16:04:21 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Mon, 23 Nov 2015 11:33:55 +0000 (11:33 +0000)]
Merge branch 'wip-mdl-50163' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 23 Nov 2015 09:43:31 +0000 (09:43 +0000)]
Merge branch 'MDL-52166' of https://github.com/timhunt/moodle
David Monllao [Mon, 23 Nov 2015 09:00:24 +0000 (17:00 +0800)]
Merge branch 'MDL-52214-master-crawler' of git://github.com/mudrd8mz/moodle
David Mudrák [Thu, 19 Nov 2015 13:14:16 +0000 (14:14 +0100)]
MDL-52214 core: Fix case sensitivity in user agent comparison
The previous 2.9 implementation of is_web_crawler() used stripos() in
certain cases. The unit tests re-added in the previous commit revealed
that certain crawlers (such as BaiDuSpider) were not correctly detected
in the new refactored implementation.
It seems lesser evil and safe enough to use /i in the regex search even
though it is not 100% same logic as before - as stripos() was used in
some cases only, not always.
David Mudrák [Thu, 19 Nov 2015 12:21:49 +0000 (13:21 +0100)]
MDL-52214 core: Fix the is_web_crawler() regression
In MDL-50891, the is_web_crawler() was refactored into a core_useragent
method and the function itself was deprecated. However, there were no
unit tests kept to check the backwards compatible behaviour. It turned
out that the deprecated function leads to PHP fatal error due to a typo.
This patch fixes the typo and brings back the previous unit tests. To be
able to explicitly check the raised debugging message, the test case
now must be subclass of advanced_testcase.
Additionally fixes missing info about the function being deprecated.
David Monllao [Mon, 23 Nov 2015 08:40:26 +0000 (16:40 +0800)]
Merge branch 'MDL-52180-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 23 Nov 2015 08:10:25 +0000 (16:10 +0800)]
Merge branch 'MDL-52086' of git://github.com/bostelm/moodle
David Monllao [Mon, 23 Nov 2015 07:42:27 +0000 (15:42 +0800)]
Merge branch 'MDL-52029-31' of git://github.com/vadimonus/moodle
David Monllao [Mon, 23 Nov 2015 06:07:21 +0000 (14:07 +0800)]
Merge branch 'MDL-52160-master' of git://github.com/FMCorz/moodle
David Monllao [Mon, 23 Nov 2015 05:56:06 +0000 (13:56 +0800)]
Merge branch 'MDL-49490-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 23 Nov 2015 05:32:35 +0000 (13:32 +0800)]
Merge branch 'MDL-43069-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Wed, 18 Nov 2015 16:45:31 +0000 (16:45 +0000)]
MDL-37834 assign: avoid newlines in status column of csv
Previously we were generating a CSV file with newlines in it, which
seems to cause problems importing into some versions of MS Excel.
Instead seperate status lines by '-' - this column is only used to
provide context to the teacher in the spreadsheet.
AMOS bot [Fri, 20 Nov 2015 16:04:07 +0000 (00:04 +0800)]
Automatically generated installer lang files
David Monllao [Wed, 11 Nov 2015 07:35:56 +0000 (15:35 +0800)]
MDL-52095 themes: Padding to the left on RTL langs
AMOS bot [Thu, 19 Nov 2015 16:04:07 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Thu, 19 Nov 2015 09:21:07 +0000 (09:21 +0000)]
weekly on-sync release 3.1dev
Dan Poltawski [Thu, 19 Nov 2015 09:21:04 +0000 (09:21 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 19 Nov 2015 08:43:19 +0000 (09:43 +0100)]
Merge branch 'wip-MDL-52203-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 19 Nov 2015 07:06:16 +0000 (07:06 +0000)]
Merge branch 'MDL-42571_master-fix2' of git://github.com/dmonllao/moodle
David Monllao [Thu, 19 Nov 2015 06:59:03 +0000 (14:59 +0800)]
MDL-42571 editpdf: Fix search comments
They are also hidden instead of destroyed.
Dan Poltawski [Thu, 19 Nov 2015 06:47:30 +0000 (06:47 +0000)]
Merge branch 'wip-MDL-52194-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 19 Nov 2015 06:33:54 +0000 (06:33 +0000)]
Merge branch 'MDL-52162_master' of git://github.com/dmonllao/moodle
David Monllao [Thu, 19 Nov 2015 04:29:20 +0000 (12:29 +0800)]
MDL-42571 editpdf: Fix comments search and multiple views drawing
Marina Glancy [Thu, 19 Nov 2015 03:06:48 +0000 (11:06 +0800)]
MDL-52203 qtype_multianswer: avoid fatal error during upgrade
Henning Bostelmann [Mon, 9 Nov 2015 23:22:53 +0000 (23:22 +0000)]
MDL-52086 output renderers: show subtree only when tab is activated
AMOS bot [Wed, 18 Nov 2015 16:04:45 +0000 (00:04 +0800)]
Automatically generated installer lang files
Pavel Sokolov [Thu, 5 Dec 2013 13:00:34 +0000 (17:00 +0400)]
MDL-43069 assign: prevent JS error on grading table
Previously submission comments failed to expand if you hid
the file submissions column.
Dan Poltawski [Wed, 18 Nov 2015 11:45:45 +0000 (11:45 +0000)]
MDL-45934 backup: do not reset completion enabled flag
The 'completion enabled' flag does not reflect any course data, its a
course setting. Previously when doing a backup deleteting existing
course content this was forced off when it should not have been.
Dan Poltawski [Wed, 4 Nov 2015 14:10:40 +0000 (14:10 +0000)]
MDL-49490 assign: can't export to portfolio on non-submission
Marina Glancy [Wed, 18 Nov 2015 07:26:18 +0000 (15:26 +0800)]
MDL-52194 flowplayer: do not check request
$_REQUEST variable may contain cookies in some php configurations. See also MDL-48085
David Monllao [Wed, 18 Nov 2015 05:15:46 +0000 (13:15 +0800)]
MDL-52162 question: Removing unnecessary dependency
APIs dependencies were correctly removed during MDL-38214 review although
this unnecessary require remained here.
Credit to Marina Glancy.
Vadim Dvorovenko [Wed, 18 Nov 2015 01:44:04 +0000 (08:44 +0700)]
MDL-52029 installer: Unstyled installer if display_errors is on
Error in MDL-43839 solution caused inclusion of unexistent file in
install/css.php.
Dan Poltawski [Tue, 17 Nov 2015 16:27:42 +0000 (16:27 +0000)]
Merge branch 'MDL-52140' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Tue, 17 Nov 2015 16:08:56 +0000 (17:08 +0100)]
MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts
Dan Poltawski [Tue, 17 Nov 2015 15:32:12 +0000 (15:32 +0000)]
MDL-52185 report: remove ugly bullet points
Dan Poltawski [Tue, 17 Nov 2015 09:39:44 +0000 (09:39 +0000)]
MDL-52180 travis: remove weekly release checker
To prevent false positives
Rajesh Taneja [Tue, 17 Nov 2015 04:59:06 +0000 (12:59 +0800)]
MDL-50163 behat: Return subcontext from session
Creating a new context with new mink context
with different session was keeping the session
and was not returning proper session information
rajesh Taneja [Thu, 22 Oct 2015 03:35:00 +0000 (11:35 +0800)]
MDL-50163 behat: Restart session after scenario with switch_window
Restart session after a scenario with switch window
is finished. This will close all open browser windows
and open a new browser window
David Monllao [Tue, 17 Nov 2015 02:20:59 +0000 (10:20 +0800)]
Merge branch 'MDL-51988-master' of git://github.com/danpoltawski/moodle
Russell Smith [Mon, 16 Nov 2015 01:14:43 +0000 (12:14 +1100)]
MDL-50700 gradereport_overview: Call $PAGE->set_course
To ensure correct blocks are displayed.
David Monllao [Tue, 17 Nov 2015 00:54:50 +0000 (08:54 +0800)]
Merge branch 'MDL-46049-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Mon, 16 Nov 2015 16:21:17 +0000 (16:21 +0000)]
Merge branch 'MDL-52021-master-test' of git://github.com/junpataleta/moodle
AMOS bot [Mon, 16 Nov 2015 16:05:09 +0000 (00:05 +0800)]
Automatically generated installer lang files
Tim Hunt [Mon, 16 Nov 2015 14:37:42 +0000 (14:37 +0000)]
MDL-52166 gradebook: overview report fails with separate groups
Frederic Massart [Mon, 16 Nov 2015 11:28:06 +0000 (19:28 +0800)]
MDL-52160 navigation: Really remove module settings empty nodes
Dan Poltawski [Mon, 16 Nov 2015 09:28:37 +0000 (09:28 +0000)]
Merge branch 'MDL-52139' of git://github.com/stronk7/moodle
David Monllao [Mon, 16 Nov 2015 07:25:42 +0000 (15:25 +0800)]
Merge branch 'MDL-47065-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 16 Nov 2015 06:54:19 +0000 (14:54 +0800)]
Merge branch 'MDL-41643-master' of git://github.com/jojoob/moodle
David Monllao [Mon, 16 Nov 2015 06:25:48 +0000 (14:25 +0800)]
Merge branch 'MDL-50687-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 16 Nov 2015 06:19:18 +0000 (14:19 +0800)]
Merge branch 'MDL-50564-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 16 Nov 2015 05:39:59 +0000 (13:39 +0800)]
Merge branch 'MDL-42571' of git://github.com/blaky/moodle
Conflicts:
mod/assign/feedback/editpdf/version.php
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 23:39:17 +0000 (00:39 +0100)]
MDL-52139 backup: Bump release to 3.1
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 22:23:46 +0000 (23:23 +0100)]
weekly back-to-dev release 3.1dev
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 17:44:56 +0000 (18:44 +0100)]
Change travis.yml back to master
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 17:44:55 +0000 (18:44 +0100)]
Moodle release 3.0
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 17:44:55 +0000 (18:44 +0100)]
Change travis.yml to MOODLE_30_STABLE
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 17:44:47 +0000 (18:44 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Sun, 15 Nov 2015 16:05:33 +0000 (16:05 +0000)]
Merge branch 'MDL-52126' of git://github.com/stronk7/moodle
AMOS bot [Sun, 15 Nov 2015 16:04:22 +0000 (00:04 +0800)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Sat, 14 Nov 2015 19:06:03 +0000 (20:06 +0100)]
MDL-52126 forum: Verify forum mailout contents
New unit test able to verify mail contents
configured by provider do match all expectations defined.
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 09:33:19 +0000 (10:33 +0100)]
MDL-52126 forum: Correct over-escaping of html-based emails
Andrew Nicols [Fri, 13 Nov 2015 14:17:20 +0000 (22:17 +0800)]
MDL-52126 forum: Correct over-escaping of text-based emails
AMOS bot [Sat, 14 Nov 2015 16:04:05 +0000 (00:04 +0800)]
Automatically generated installer lang files
Johannes Burk [Thu, 29 Oct 2015 10:47:48 +0000 (11:47 +0100)]
MDL-41643 datafield_checkbox: Add line breaks behind checkbox options.
Add line a break behind each checkbox option in advanced search.
Frederic Massart [Thu, 12 Nov 2015 17:34:18 +0000 (11:34 -0600)]
MDL-50564 atto: Require atto_menu in atto_plugin
AMOS bot [Fri, 13 Nov 2015 16:06:20 +0000 (00:06 +0800)]
Automatically generated installer lang files
Syam Mohan [Thu, 29 Oct 2015 05:13:23 +0000 (10:43 +0530)]
MDL-52021 enrollib: Removed repeated capability
'moodle/role:assign' replicated in the permission checking
David Monllao [Fri, 13 Nov 2015 07:28:19 +0000 (15:28 +0800)]
Moodle release 3.0rc4
David Monllao [Fri, 13 Nov 2015 07:28:16 +0000 (15:28 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Fri, 30 Oct 2015 11:40:33 +0000 (11:40 +0000)]
MDL-50687 phpunit: error early if required locale not installed
David Monllao [Thu, 12 Nov 2015 23:49:39 +0000 (07:49 +0800)]
MDL-52071 webservices: Bump version to update services