moodle.git
5 years agoMDL-50540 glossary: New WS mod_glossary_get_glossaries_by_courses
Costantino Cito [Fri, 19 Jun 2015 16:20:03 +0000 (18:20 +0200)]
MDL-50540 glossary: New WS mod_glossary_get_glossaries_by_courses

5 years agoweekly release 3.1dev
Eloy Lafuente (stronk7) [Thu, 3 Dec 2015 18:40:42 +0000 (19:40 +0100)]
weekly release 3.1dev

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 3 Dec 2015 18:40:33 +0000 (19:40 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

5 years agoMDL-52141 backup: test restore_log_rule don't modify passed log anymore
Eloy Lafuente (stronk7) [Thu, 3 Dec 2015 16:11:35 +0000 (17:11 +0100)]
MDL-52141 backup: test restore_log_rule don't modify passed log anymore

5 years agoNOBUG: Fixup commit to fix stuff wrongly changed on merge commits
Eloy Lafuente (stronk7) [Thu, 3 Dec 2015 10:35:13 +0000 (11:35 +0100)]
NOBUG: Fixup commit to fix stuff wrongly changed on merge commits

On rewriting MDL-47491, we ended in a situation where these
modifications had been incorporated via merge commits. And kept
undetected by rebase -ip.

In general, please, use merge commits only for solving conflicts,
never as a replacement for fixup commits. To fix non-conflicting
things, add new, proper, fixup commits.

5 years agoMerge branch 'MDL-48004-master' of git://github.com/danpoltawski/moodle
David Monllao [Thu, 3 Dec 2015 04:51:48 +0000 (12:51 +0800)]
Merge branch 'MDL-48004-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-51700-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 2 Dec 2015 10:31:10 +0000 (10:31 +0000)]
Merge branch 'MDL-51700-master' of git://github.com/FMCorz/moodle

5 years agoMerge branch 'MDL-48451-behat-tests' of github.com:ryanwyllie/moodle
Dan Poltawski [Wed, 2 Dec 2015 09:36:29 +0000 (09:36 +0000)]
Merge branch 'MDL-48451-behat-tests' of github.com:ryanwyllie/moodle

5 years agoMDL-48451 report_outline: additional behat coverage
Ryan Wyllie [Wed, 2 Dec 2015 05:36:15 +0000 (05:36 +0000)]
MDL-48451 report_outline: additional behat coverage

5 years agoMerge branch 'MDL-50269_master' of git://github.com/markn86/moodle
David Monllao [Wed, 2 Dec 2015 07:54:25 +0000 (15:54 +0800)]
Merge branch 'MDL-50269_master' of git://github.com/markn86/moodle

Conflicts:
lib/upgrade.txt

5 years agoMerge branch 'wip-mdl-52357' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 2 Dec 2015 03:48:05 +0000 (11:48 +0800)]
Merge branch 'wip-mdl-52357' of https://github.com/rajeshtaneja/moodle

5 years agoMerge branch 'MDL-50710-master' of git://github.com/marinaglancy/moodle
David Monllao [Wed, 2 Dec 2015 03:40:46 +0000 (11:40 +0800)]
Merge branch 'MDL-50710-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-46350-master' of git://github.com/danpoltawski/moodle
David Monllao [Wed, 2 Dec 2015 03:13:25 +0000 (11:13 +0800)]
Merge branch 'MDL-46350-master' of git://github.com/danpoltawski/moodle

5 years agoAutomatically generated installer lang files
AMOS bot [Thu, 3 Dec 2015 16:04:11 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoMerge branch 'wip-MDL-51985-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 2 Dec 2015 02:08:18 +0000 (03:08 +0100)]
Merge branch 'wip-MDL-51985-master' of https://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-52260-master-2' of git://github.com/xow/moodle
David Monllao [Wed, 2 Dec 2015 02:01:44 +0000 (10:01 +0800)]
Merge branch 'MDL-52260-master-2' of git://github.com/xow/moodle

5 years agoMerge branch 'MDL-45364-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 2 Dec 2015 01:35:53 +0000 (02:35 +0100)]
Merge branch 'MDL-45364-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-51664 externalib: clarify crucial comment
Dan Poltawski [Tue, 1 Dec 2015 20:25:05 +0000 (20:25 +0000)]
MDL-51664 externalib: clarify crucial comment

5 years agoMerge branch 'MDL-51664-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 1 Dec 2015 20:14:59 +0000 (20:14 +0000)]
Merge branch 'MDL-51664-master' of git://github.com/FMCorz/moodle

5 years agoMDL-52292 testing: block generator fix
Dan Poltawski [Tue, 1 Dec 2015 19:02:28 +0000 (19:02 +0000)]
MDL-52292 testing: block generator fix

Stop errors when no $options supplied

5 years agoMDL-48451 report_outline: add basic coverage of distinct users
Dan Poltawski [Tue, 1 Dec 2015 16:56:51 +0000 (16:56 +0000)]
MDL-48451 report_outline: add basic coverage of distinct users

5 years agoMerge branch 'MDL-48451' of https://github.com/andrewhancox/moodle
Dan Poltawski [Tue, 1 Dec 2015 16:24:00 +0000 (16:24 +0000)]
Merge branch 'MDL-48451' of https://github.com/andrewhancox/moodle

5 years agoMerge branch 'MDL-52292' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 1 Dec 2015 16:09:04 +0000 (16:09 +0000)]
Merge branch 'MDL-52292' of git://github.com/timhunt/moodle

5 years agoMDL-26935 behat: add coverage for role renaming in course
Dan Poltawski [Tue, 1 Dec 2015 14:05:13 +0000 (14:05 +0000)]
MDL-26935 behat: add coverage for role renaming in course

5 years agoMerge branch 'MDL-26935' of https://github.com/andrewhancox/moodle
Eloy Lafuente (stronk7) [Thu, 3 Dec 2015 10:13:07 +0000 (11:13 +0100)]
Merge branch 'MDL-26935' of https://github.com/andrewhancox/moodle

5 years agoMDL-52141 backup: Ensure we don't alter the log record when parsing it.
Russell Smith [Mon, 16 Nov 2015 01:50:55 +0000 (12:50 +1100)]
MDL-52141 backup: Ensure we don't alter the log record when parsing it.

5 years agoMerge branch 'MDL-51706_master' of https://github.com/jinhofer/moodle
Dan Poltawski [Tue, 1 Dec 2015 11:41:39 +0000 (11:41 +0000)]
Merge branch 'MDL-51706_master' of https://github.com/jinhofer/moodle

5 years agoMerge branch 'MDL-37308-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 1 Dec 2015 11:13:48 +0000 (11:13 +0000)]
Merge branch 'MDL-37308-master' of git://github.com/junpataleta/moodle

5 years agoMDL-51746 accesslib: Describe instanceid in context_something::instance
Oleg Sychev [Tue, 20 Oct 2015 19:31:10 +0000 (22:31 +0300)]
MDL-51746 accesslib: Describe instanceid in context_something::instance

With no PHPDocs and $instanceid as name some module developers confuse
context_module::instance argument to be instanceid of the module while
it actually should be cmid.

5 years agoMerge branch 'MDL-51830-master' of git://github.com/lucisgit/moodle
David Monllao [Tue, 1 Dec 2015 10:29:27 +0000 (18:29 +0800)]
Merge branch 'MDL-51830-master' of git://github.com/lucisgit/moodle

5 years agoMerge branch 'master_MDL-51757' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 1 Dec 2015 09:50:59 +0000 (09:50 +0000)]
Merge branch 'master_MDL-51757' of git://github.com/danmarsden/moodle

5 years agoMerge branch 'MDL-51925-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 1 Dec 2015 09:47:36 +0000 (09:47 +0000)]
Merge branch 'MDL-51925-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-52237-master' of git://github.com/StudiUM/moodle
David Monllao [Tue, 1 Dec 2015 09:16:31 +0000 (17:16 +0800)]
Merge branch 'MDL-52237-master' of git://github.com/StudiUM/moodle

5 years agoMDL-51700 ajax: Clean the external function return values
Frederic Massart [Thu, 8 Oct 2015 09:51:05 +0000 (17:51 +0800)]
MDL-51700 ajax: Clean the external function return values

5 years agoMDL-52292 block testing generators: improve the API
Tim Hunt [Tue, 24 Nov 2015 15:58:54 +0000 (15:58 +0000)]
MDL-52292 block testing generators: improve the API

* Refactor the block generator base class, to remove the amount
  of duplication required in base classes.

* Change the defaults that are filled in to be a little more natural.

* Make the Behat step 'Given the following "block" exist:' work.

5 years agoMDL-52357 behat: add 2 sec delay to ensure window is stable
Rajesh Taneja [Tue, 1 Dec 2015 07:45:05 +0000 (15:45 +0800)]
MDL-52357 behat: add 2 sec delay to ensure window is stable

5 years agoMDL-50269 deprecations: Properly deprecate notify()
Ankit Agarwal [Thu, 28 May 2015 07:30:29 +0000 (13:00 +0530)]
MDL-50269 deprecations: Properly deprecate notify()

5 years agoMerge branch 'MDL-52219-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 30 Nov 2015 23:50:10 +0000 (00:50 +0100)]
Merge branch 'MDL-52219-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-44598_master' of https://github.com/jonof/moodle
Eloy Lafuente (stronk7) [Mon, 30 Nov 2015 22:52:45 +0000 (23:52 +0100)]
Merge branch 'MDL-44598_master' of https://github.com/jonof/moodle

5 years agoMerge branch 'MDL-52013-m' of https://github.com/micaherne/moodle
Dan Poltawski [Mon, 30 Nov 2015 15:42:58 +0000 (15:42 +0000)]
Merge branch 'MDL-52013-m' of https://github.com/micaherne/moodle

5 years agoMerge branch 'MDL-52074-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 30 Nov 2015 15:29:29 +0000 (15:29 +0000)]
Merge branch 'MDL-52074-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-52108-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 30 Nov 2015 15:25:22 +0000 (15:25 +0000)]
Merge branch 'MDL-52108-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-50661_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 30 Nov 2015 13:50:22 +0000 (13:50 +0000)]
Merge branch 'MDL-50661_master' of git://github.com/dmonllao/moodle

5 years agoMerge branch 'MDL-51718-set-scheme' of https://github.com/brendanheywood/moodle
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

5 years agoMerge branch 'MDL-52042-master' of git://github.com/ryanwyllie/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

5 years agoMerge branch 'MDL-51900_master' of https://github.com/jinhofer/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

5 years agoMerge branch 'MDL-52283-master' of git://github.com/marinaglancy/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

5 years agoMerge branch 'MDL-52332-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

5 years agoMerge branch 'MDL-51204_lang_coding_style' of git://github.com/andyjdavis/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

5 years agoMerge branch 'MDL-35982-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 30 Nov 2015 07:45:44 +0000 (15:45 +0800)]
Merge branch 'MDL-35982-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-52332 calendar: load settings using API
Marina Glancy [Fri, 27 Nov 2015 00:49:04 +0000 (08:49 +0800)]
MDL-52332 calendar: load settings using API

5 years agoMDL-52279 core_lib: Remove php4 style constructor
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

5 years agoMDL-37308 files: Additional fixes for transparency
Jun Pataleta [Wed, 18 Nov 2015 03:52:07 +0000 (21:52 -0600)]
MDL-37308 files: Additional fixes for transparency

Fixed transparency support when resizing and when not resizing.

5 years agoMDL-37308 files: support transparency when not resizing; new unit test
Jetha Chan [Tue, 9 Jun 2015 09:12:31 +0000 (17:12 +0800)]
MDL-37308 files: support transparency when not resizing; new unit test

5 years agoMDL-37308 files: convert_image() now supports transparency.
Adrian Greeve [Tue, 9 Jun 2015 06:06:42 +0000 (14:06 +0800)]
MDL-37308 files: convert_image() now supports transparency.

5 years agoMDL-50710 block_glossary_random: more precise sorting
Marina Glancy [Mon, 30 Nov 2015 01:15:40 +0000 (09:15 +0800)]
MDL-50710 block_glossary_random: more precise sorting

5 years agoMDL-50661 theme_more: New small logo setting
David Monllao [Wed, 11 Nov 2015 07:34:19 +0000 (15:34 +0800)]
MDL-50661 theme_more: New small logo setting

Adding required bits so theme_more can also set a small logo.

5 years agoMDL-50661 theme_clean: New small logo setting
David Monllao [Wed, 11 Nov 2015 07:24:18 +0000 (15:24 +0800)]
MDL-50661 theme_clean: New small logo setting

Introduces new settings to set a small logo in the navbar next
to the site name on pages where the logo is not displayed.

5 years agoMDL-51900 grade/report/singleview: Added ctrl+arrow navigation
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.

5 years agoMDL-51706 mod/assign: Moved plagiarism links to top of online text
jinhofer [Thu, 8 Oct 2015 13:12:03 +0000 (08:12 -0500)]
MDL-51706 mod/assign: Moved plagiarism links to top of online text

5 years agoMDL-51693 mod/assign: Added plagiarism links to full text
jinhofer [Wed, 7 Oct 2015 18:14:52 +0000 (13:14 -0500)]
MDL-51693 mod/assign: Added plagiarism links to full text

5 years agoAutomatically generated installer lang files
AMOS bot [Fri, 27 Nov 2015 16:04:27 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoMDL-52260 user: Fix error when saving profile with locked field
John Okely [Tue, 24 Nov 2015 04:25:21 +0000 (12:25 +0800)]
MDL-52260 user: Fix error when saving profile with locked field

5 years agoMDL-52283 core: password_hash() deprecation in PHP7
Tony Levi [Mon, 3 Aug 2015 06:46:03 +0000 (16:16 +0930)]
MDL-52283 core: password_hash() deprecation in PHP7

5 years agoMDL-45364 ddimageortext: refine naming & docs of new methods
Dan Poltawski [Thu, 26 Nov 2015 17:01:37 +0000 (17:01 +0000)]
MDL-45364 ddimageortext: refine naming & docs of new methods

5 years agoMDL-45364 qtype_ddimageortext: Fix JS Lint issues
Andrew Nicols [Tue, 24 Nov 2015 12:14:32 +0000 (20:14 +0800)]
MDL-45364 qtype_ddimageortext: Fix JS Lint issues

5 years agoMDL-45364 atto_rtl: Fix JS lint
Andrew Nicols [Tue, 24 Nov 2015 12:14:12 +0000 (20:14 +0800)]
MDL-45364 atto_rtl: Fix JS lint

5 years agoMDL-48004 question: remove buggy arg of question_edit_setup
Dan Poltawski [Thu, 26 Nov 2015 15:04:10 +0000 (15:04 +0000)]
MDL-48004 question: remove buggy arg of question_edit_setup

There are no uses of this in core and it does not make sense

5 years agoMDL-48004 question: prevent notices on import screen
Dan Poltawski [Thu, 26 Nov 2015 14:53:15 +0000 (14:53 +0000)]
MDL-48004 question: prevent notices on import screen

If query params were not passed the page would previously display debug
notices as setting the $requirecourseid param to question_edit_setup()
was buggy.

5 years agoMDL-52013 assign: Allow subplugins to add calendar events
Michael Aherne [Mon, 2 Nov 2015 12:04:01 +0000 (12:04 +0000)]
MDL-52013 assign: Allow subplugins to add calendar events

5 years agoMDL-35982 behat: delete blog entry coverage
Dan Poltawski [Fri, 30 Oct 2015 15:15:07 +0000 (15:15 +0000)]
MDL-35982 behat: delete blog entry coverage

5 years agoMDL-35982 blog: improve the delete entry confirmation string
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.

5 years agoMDL-35982 blog: reorder blog delete confirmation
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

5 years agoMDL-35982 blog: prevent index throwing errors with 0 courseid
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..

5 years agoMDL-46350 blog: call parent validation
Dan Poltawski [Fri, 30 Oct 2015 16:26:37 +0000 (16:26 +0000)]
MDL-46350 blog: call parent validation

(Helps satify codechecker, thats all..)

5 years agoMDL-52219 phpunit: updated for new defaults
Dan Poltawski [Tue, 24 Nov 2015 14:41:22 +0000 (14:41 +0000)]
MDL-52219 phpunit: updated for new defaults

The externallib assertion was previously never being run and had a typo..

5 years agoMDL-52219 behat: remove steps which turn on avaibility/completion
Dan Poltawski [Mon, 23 Nov 2015 11:11:27 +0000 (11:11 +0000)]
MDL-52219 behat: remove steps which turn on avaibility/completion

Now its the default, we can reduce test time by relying on the default
state rather than going around turning it on

5 years agoMDL-52219 admin: Enable completion and restricted access by default
Dan Poltawski [Fri, 20 Nov 2015 18:41:44 +0000 (18:41 +0000)]
MDL-52219 admin: Enable completion and restricted access by default

5 years agoweekly on-sync release 3.1dev
David Monllao [Thu, 26 Nov 2015 03:02:40 +0000 (11:02 +0800)]
weekly on-sync release 3.1dev

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
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

5 years agoAutomatically generated installer lang files
AMOS bot [Wed, 25 Nov 2015 16:04:22 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoMerge branch 'MDL-52291' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 25 Nov 2015 11:22:17 +0000 (11:22 +0000)]
Merge branch 'MDL-52291' of git://github.com/stronk7/moodle

5 years agoMDL-52160 navigation: Mark category and module settings nodes as branch
Frederic Massart [Wed, 25 Nov 2015 05:03:25 +0000 (13:03 +0800)]
MDL-52160 navigation: Mark category and module settings nodes as branch

5 years agoMDL-51757 mod_scorm: Remove duplicate function param
Tony Levi [Wed, 14 Oct 2015 06:23:30 +0000 (14:23 +0800)]
MDL-51757 mod_scorm: Remove duplicate function param

convert invalid break calls to exceptions for PHP 7

5 years agoMDL-52291 questions: fix upgrade from 2.5 and earlier
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.

5 years agoAutomatically generated installer lang files
AMOS bot [Tue, 24 Nov 2015 16:04:12 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoMerge branch 'MDL-44330' of git://github.com/NeillM/moodle
David Monllao [Tue, 24 Nov 2015 09:03:06 +0000 (17:03 +0800)]
Merge branch 'MDL-44330' of git://github.com/NeillM/moodle

5 years agoMerge branch 'MDL-45934-master' of git://github.com/danpoltawski/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

5 years agoMDL-44330 Assign: Assignment grading may not display expected student
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.

5 years agoMDL-50163 behat: wait to ensure elements are placed properly by js.
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.

5 years agoMerge branch 'MDL-52095_master' of git://github.com/dmonllao/moodle
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

5 years agoMerge branch 'MDL-52185-master' of git://github.com/danpoltawski/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

5 years agoMDL-52237 navigationlib: Plugins can extend navigation user profile
Jean-Philippe Gaudreau [Thu, 19 Nov 2015 20:54:04 +0000 (15:54 -0500)]
MDL-52237 navigationlib: Plugins can extend navigation user profile

5 years agoAutomatically generated installer lang files
AMOS bot [Mon, 23 Nov 2015 16:04:21 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoMerge branch 'wip-mdl-50163' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 23 Nov 2015 11:33:55 +0000 (11:33 +0000)]
Merge branch 'wip-mdl-50163' of https://github.com/rajeshtaneja/moodle

5 years agoMerge branch 'MDL-52166' of https://github.com/timhunt/moodle
Dan Poltawski [Mon, 23 Nov 2015 09:43:31 +0000 (09:43 +0000)]
Merge branch 'MDL-52166' of https://github.com/timhunt/moodle

5 years agoMerge branch 'MDL-52214-master-crawler' of git://github.com/mudrd8mz/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

5 years agoMDL-52214 core: Fix case sensitivity in user agent comparison
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.

5 years agoMDL-52214 core: Fix the is_web_crawler() regression
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.

5 years agoMerge branch 'MDL-52180-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 23 Nov 2015 08:40:26 +0000 (16:40 +0800)]
Merge branch 'MDL-52180-master' of git://github.com/danpoltawski/moodle