moodle.git
6 years agoMDL-49432 behat: guzzle packages has been unified
Rajesh Taneja [Fri, 20 Mar 2015 04:00:06 +0000 (12:00 +0800)]
MDL-49432 behat: guzzle packages has been unified

Current version of goutte is pointing to old guzzle packages
guzzle/common, guzzle/stream, guzzle/parser and guzzle/http.
They have been unified to guzzlehttp/guzzle, so include it to avoid
using old packages

6 years agoweekly release 2.9dev
Eloy Lafuente (stronk7) [Thu, 19 Mar 2015 11:41:54 +0000 (12:41 +0100)]
weekly release 2.9dev

6 years agoMerge branch 'behat_parallel_extraopts' of https://github.com/tlevi/moodle
Eloy Lafuente (stronk7) [Thu, 19 Mar 2015 10:46:30 +0000 (11:46 +0100)]
Merge branch 'behat_parallel_extraopts' of https://github.com/tlevi/moodle

6 years agoMDL-48715 mod_lesson: completion rules must not be dependent
Jean-Michel Vedrine [Wed, 18 Mar 2015 09:10:48 +0000 (10:10 +0100)]
MDL-48715 mod_lesson: completion rules must not be dependent

6 years agoRevert "Merge branch 'MDL-49121_master_optimize_lesson_report' of https://github...
Dan Poltawski [Wed, 18 Mar 2015 09:22:21 +0000 (09:22 +0000)]
Revert "Merge branch 'MDL-49121_master_optimize_lesson_report' of https://github.com/SWiT/moodle"

This reverts commit 94d0be78407fe2e6abf5acee7c7decda7ab837c2, reversing
changes made to f51ef4d102530e2a7c618d54ff06725e6bf20f4d.

6 years agoRevert "MDL-49121 mod_lesson: Fixed typo in link creation"
Dan Poltawski [Wed, 18 Mar 2015 09:22:16 +0000 (09:22 +0000)]
Revert "MDL-49121 mod_lesson: Fixed typo in link creation"

This reverts commit feb8ca8c72dcf429d3c06df6587b57221ae615f4.

6 years agoMerge branch 'wip-mdl-49121' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 18 Mar 2015 08:21:22 +0000 (08:21 +0000)]
Merge branch 'wip-mdl-49121' of git://github.com/rajeshtaneja/moodle

6 years agoMDL-49121 mod_lesson: Fixed typo in link creation
Rajesh Taneja [Wed, 18 Mar 2015 07:30:24 +0000 (15:30 +0800)]
MDL-49121 mod_lesson: Fixed typo in link creation

6 years agoMDL-49445 behat: Change selector as underline tr has same string
Rajesh Taneja [Wed, 18 Mar 2015 02:30:22 +0000 (10:30 +0800)]
MDL-49445 behat: Change selector as underline tr has same string

6 years agoMDL-40990 mod_quiz: Changing upgrade process according to version
David Monllao [Wed, 18 Mar 2015 00:34:48 +0000 (08:34 +0800)]
MDL-40990 mod_quiz: Changing upgrade process according to version

6 years agoMerge branch 'MDL-48715' of git://github.com/jmvedrine/moodle
David Monllao [Wed, 18 Mar 2015 00:31:03 +0000 (08:31 +0800)]
Merge branch 'MDL-48715' of git://github.com/jmvedrine/moodle

6 years agoMerge branch 'MDL-40990' of git://github.com/timhunt/moodle
David Monllao [Wed, 18 Mar 2015 00:22:06 +0000 (08:22 +0800)]
Merge branch 'MDL-40990' of git://github.com/timhunt/moodle

6 years agoMDL-48715 mod_lesson: use only one field for time spent rule
Jean-Michel Vedrine [Tue, 17 Mar 2015 07:40:17 +0000 (08:40 +0100)]
MDL-48715 mod_lesson: use only one field for time spent rule

6 years agoMDL-40990 quiz: option to require prev Q finished before next shown
Tim Hunt [Thu, 26 Feb 2015 11:53:00 +0000 (11:53 +0000)]
MDL-40990 quiz: option to require prev Q finished before next shown

Further improvements to this code, including resolving edge cases:

* The new feature can only be used when it is possible for the
previous question in the quiz to be complete.

* Also, this new feature cannot be used in combination with shuffle
questions, because that make no sense; nor in combination with
sequential navigation, because to make that work properly would be a lot
of effort. If someone needs that to work later, it should be possible
for them to implement it.

* There were changes in the edit renderer API, to try to make things
more  consistent, and to make it less likely we will need to change
things again in the future. See mod/quiz/upgrade.txt.

* As part of this change, the styling of the Edit quiz page was tweaked
to make slighly more efficient use of the horizontal space, and to be
more symmetrical.

6 years agoMDL-40990 quiz: option to require prev Q finished before next shown
M Kassaei [Thu, 9 Oct 2014 08:21:52 +0000 (09:21 +0100)]
MDL-40990 quiz: option to require prev Q finished before next shown

6 years agoMerge branch 'MDL-49121_master_optimize_lesson_report' of https://github.com/SWiT...
Dan Poltawski [Tue, 17 Mar 2015 11:14:21 +0000 (11:14 +0000)]
Merge branch 'MDL-49121_master_optimize_lesson_report' of https://github.com/SWiT/moodle

6 years agoMerge branch 'MDL-49296_m29v3' of https://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Tue, 17 Mar 2015 11:03:50 +0000 (12:03 +0100)]
Merge branch 'MDL-49296_m29v3' of https://github.com/sbourget/moodle

6 years agoMerge branch 'MDL-49361-master-stringman' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 17 Mar 2015 11:00:29 +0000 (12:00 +0100)]
Merge branch 'MDL-49361-master-stringman' of git://github.com/mudrd8mz/moodle

6 years agoMerge branch 'wip-MDL-49439-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 17 Mar 2015 10:58:35 +0000 (11:58 +0100)]
Merge branch 'wip-MDL-49439-master' of https://github.com/marinaglancy/moodle

6 years agoMerge branch 'MDL-49309-bulkadd-cohort-sort' of https://github.com/GeeGee-Edu/moodle
Dan Poltawski [Tue, 17 Mar 2015 09:20:17 +0000 (09:20 +0000)]
Merge branch 'MDL-49309-bulkadd-cohort-sort' of https://github.com/GeeGee-Edu/moodle

6 years agoMerge branch 'MDL-49371_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 17 Mar 2015 09:06:59 +0000 (09:06 +0000)]
Merge branch 'MDL-49371_master' of git://github.com/dmonllao/moodle

6 years agoMDL-49385 blocks: Adding todo tag
David Monllao [Tue, 17 Mar 2015 06:52:12 +0000 (14:52 +0800)]
MDL-49385 blocks: Adding todo tag

6 years agoMerge branch 'MDL-49385-master' of git://github.com/lucisgit/moodle
David Monllao [Tue, 17 Mar 2015 06:49:05 +0000 (14:49 +0800)]
Merge branch 'MDL-49385-master' of git://github.com/lucisgit/moodle

6 years agoMDL-49439 enrol: Allow quick adding several instances
Marina Glancy [Mon, 9 Mar 2015 07:01:21 +0000 (15:01 +0800)]
MDL-49439 enrol: Allow quick adding several instances

6 years agoMDL-49296 Lesson: Add titles to action links
Stephen Bourget [Tue, 17 Mar 2015 00:33:22 +0000 (20:33 -0400)]
MDL-49296 Lesson: Add titles to action links

6 years agoMDL-49356 restore: handle course completion if still not defined
Eugene Venter [Tue, 3 Mar 2015 00:36:11 +0000 (13:36 +1300)]
MDL-49356 restore: handle course completion if still not defined

Before this patch course completion only was restored if, appart from
other conditions... we were restoring to new course, never to existing
one.

This relaxes a bit that condition in order to be able to restore to an
existing course not having any course completion setting defined, so no
conflict will happen ever.

6 years agoMerge branch 'MDL-49389' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 16 Mar 2015 23:28:31 +0000 (00:28 +0100)]
Merge branch 'MDL-49389' of git://github.com/timhunt/moodle

6 years agoMDL-49381 message: Remove old useridfrom indexes
Andrew Nicols [Fri, 6 Mar 2015 03:18:03 +0000 (11:18 +0800)]
MDL-49381 message: Remove old useridfrom indexes

6 years agoMDL-49276 config-dist: Removed legacy config options
Mike Grant [Tue, 10 Mar 2015 09:21:22 +0000 (09:21 +0000)]
MDL-49276 config-dist: Removed legacy config options

Both $CFG->logsql and $CFG->dblogerror had no use in moodle core
since ages ago (just the former had one use for nothing). Good time
to get rid of both as they are 100% misleading.

6 years agoMerge branch 'MDL-48965' of git://github.com/jmvedrine/moodle
Dan Poltawski [Mon, 16 Mar 2015 21:05:56 +0000 (21:05 +0000)]
Merge branch 'MDL-48965' of git://github.com/jmvedrine/moodle

6 years agoMerge branch 'wip-MDL-49267-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 16 Mar 2015 15:52:36 +0000 (15:52 +0000)]
Merge branch 'wip-MDL-49267-master' of git://github.com/marinaglancy/moodle

6 years agoMerge branch 'MDL-48717-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 16 Mar 2015 15:28:50 +0000 (15:28 +0000)]
Merge branch 'MDL-48717-master' of git://github.com/jleyva/moodle

6 years agoMDL-48717 book: book_exports_contents unit tests
Juan Leyva [Mon, 16 Mar 2015 14:59:20 +0000 (15:59 +0100)]
MDL-48717 book: book_exports_contents unit tests

6 years agoMerge branch 'MDL-49187' of https://github.com/spvickers/moodle
Dan Poltawski [Mon, 16 Mar 2015 14:45:53 +0000 (14:45 +0000)]
Merge branch 'MDL-49187' of https://github.com/spvickers/moodle

6 years agoMerge branch 'MDL-49152-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 16 Mar 2015 14:26:15 +0000 (14:26 +0000)]
Merge branch 'MDL-49152-master' of git://github.com/damyon/moodle

6 years agoMerge branch 'MDL-49442-master' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 16 Mar 2015 13:31:07 +0000 (13:31 +0000)]
Merge branch 'MDL-49442-master' of git://github.com/jethac/moodle

6 years agoMerge branch 'MDL-49163-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 16 Mar 2015 11:01:18 +0000 (11:01 +0000)]
Merge branch 'MDL-49163-master' of git://github.com/damyon/moodle

6 years agoMerge branch 'MDL-45725-master' of https://github.com/lucisgit/moodle
Dan Poltawski [Mon, 16 Mar 2015 10:52:02 +0000 (10:52 +0000)]
Merge branch 'MDL-45725-master' of https://github.com/lucisgit/moodle

6 years agoMDL-45725 core_lib: Add unit test for persistent flexible tables
Tony Butler [Wed, 4 Mar 2015 11:26:41 +0000 (11:26 +0000)]
MDL-45725 core_lib: Add unit test for persistent flexible tables

6 years agoMDL-45725 core_lib: Save user preferences for flexible tables
Tony Butler [Wed, 28 Jan 2015 14:19:03 +0000 (14:19 +0000)]
MDL-45725 core_lib: Save user preferences for flexible tables

6 years agoMerge branch 'MDL-44367_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 16 Mar 2015 09:57:16 +0000 (09:57 +0000)]
Merge branch 'MDL-44367_master' of git://github.com/dmonllao/moodle

6 years agoMerge branch 'MDL-49445' of git://github.com/timhunt/moodle
David Monllao [Mon, 16 Mar 2015 07:38:02 +0000 (15:38 +0800)]
Merge branch 'MDL-49445' of git://github.com/timhunt/moodle

6 years agoMDL-49531 behat: Fix parallel runner with extraopts
Tony Levi [Mon, 16 Mar 2015 05:58:25 +0000 (16:28 +1030)]
MDL-49531 behat: Fix parallel runner with extraopts

6 years agoMerge branch 'MDL-47712-int-fix' of git://github.com/dmonllao/moodle
Andrew Nicols [Mon, 16 Mar 2015 05:50:11 +0000 (13:50 +0800)]
Merge branch 'MDL-47712-int-fix' of git://github.com/dmonllao/moodle

6 years agoMerge branch 'MDL-19670-master' of git://github.com/gurgus/moodle
David Monllao [Mon, 16 Mar 2015 05:45:31 +0000 (13:45 +0800)]
Merge branch 'MDL-19670-master' of git://github.com/gurgus/moodle

6 years agoMDL-47712 question_multianswer: Concat as string
David Monllao [Mon, 16 Mar 2015 04:25:22 +0000 (12:25 +0800)]
MDL-47712 question_multianswer: Concat as string

6 years agoMerge branch 'MDL-47712-master' of git://github.com/dthies/moodle
David Monllao [Mon, 16 Mar 2015 02:33:14 +0000 (10:33 +0800)]
Merge branch 'MDL-47712-master' of git://github.com/dthies/moodle

6 years agoMerge branch 'master_MDL-44548' of git://github.com/danmarsden/moodle
David Monllao [Mon, 16 Mar 2015 02:04:14 +0000 (10:04 +0800)]
Merge branch 'master_MDL-44548' of git://github.com/danmarsden/moodle

6 years agoMerge branch 'wip-MDL-47729-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 16 Mar 2015 01:49:05 +0000 (09:49 +0800)]
Merge branch 'wip-MDL-47729-master' of git://github.com/marinaglancy/moodle

6 years agoMDL-44548 mod_scorm: force an external sync to check for updated files.
Dan Marsden [Thu, 14 Aug 2014 08:33:05 +0000 (20:33 +1200)]
MDL-44548 mod_scorm: force an external sync to check for updated files.

6 years agoMDL-48715 mod_lesson: behat test for time spent completion condition
Jean-Michel Vedrine [Sun, 8 Mar 2015 08:17:46 +0000 (09:17 +0100)]
MDL-48715 mod_lesson: behat test for time spent completion condition

6 years agoMDL-48715 mod_lesson: add a time spent custom completion rule
Jean-Michel Vedrine [Sun, 28 Dec 2014 16:47:13 +0000 (17:47 +0100)]
MDL-48715 mod_lesson: add a time spent custom completion rule

6 years agoMDL-49152 output: Templates for renderers (JS and PHP)
Damyon Wiese [Sun, 22 Feb 2015 07:24:44 +0000 (15:24 +0800)]
MDL-49152 output: Templates for renderers (JS and PHP)

Mustache support for rendering templates from either php or js.

6 years agoMDL-47712 qtype_multianswer: Move mathjaxloader spans to outer question
Daniel Thies [Thu, 12 Mar 2015 16:05:27 +0000 (11:05 -0500)]
MDL-47712 qtype_multianswer: Move mathjaxloader spans to outer question

6 years agoMDL-49446 behat: should_not_be_visible steps were not working
Tim Hunt [Mon, 9 Mar 2015 13:42:13 +0000 (13:42 +0000)]
MDL-49446 behat: should_not_be_visible steps were not working

I fixed all similar problems in this class, even ones where it did
actually work becuase the two exceptions were of different types.
This pattern seems to have been copied and pasted a lot in this class,
and I am sure that will happen again, so I did not want to leave any
dangerous potential examples around.

6 years agoMDL-49445 behat: selectors should match the most specific tr or li
Tim Hunt [Mon, 9 Mar 2015 13:30:24 +0000 (13:30 +0000)]
MDL-49445 behat: selectors should match the most specific tr or li

I also fixed the text rule, which already did this, to use the same
idiom. It is unnecessarily inefficient to count all the things and
compare to 0. Not exists should be faster.

Also, updated all the selectors here to consistently start relative to
the current node (.//, not //).

6 years agoMDL-49389 blocklib: avoid notices when moving blocks to the bottom
Tim Hunt [Wed, 4 Mar 2015 18:47:59 +0000 (18:47 +0000)]
MDL-49389 blocklib: avoid notices when moving blocks to the bottom

6 years agoMDL-40990 qbehaviours: method to say if attempts can finish naturally
Tim Hunt [Thu, 26 Feb 2015 17:13:59 +0000 (17:13 +0000)]
MDL-40990 qbehaviours: method to say if attempts can finish naturally

6 years agoMDL-49121 mod/lesson: master optimize lesson report and fixed for coding guidelines
Matt Switlik [Mon, 23 Feb 2015 15:14:22 +0000 (10:14 -0500)]
MDL-49121 mod/lesson: master optimize lesson report and fixed for coding guidelines

6 years agoMDL-49309 user: sort cohorts by name in bulk user actions
Gary Krige [Fri, 13 Mar 2015 10:28:00 +0000 (12:28 +0200)]
MDL-49309 user: sort cohorts by name in bulk user actions

6 years agoMDL-48717 book: book_exports_contents function implementation
Juan Leyva [Wed, 25 Feb 2015 15:11:46 +0000 (16:11 +0100)]
MDL-48717 book: book_exports_contents function implementation

6 years agoMDL-49361 lang: Add support for $CFG->customstringmanager
David Mudrák [Thu, 12 Mar 2015 20:03:43 +0000 (21:03 +0100)]
MDL-49361 lang: Add support for $CFG->customstringmanager

6 years agoMDL-49385 block_base: Deprecate config_save function.
Ruslan Kabalin [Thu, 12 Mar 2015 16:05:11 +0000 (16:05 +0000)]
MDL-49385 block_base: Deprecate config_save function.

block_base->config_save is not used anywhere any more. If contributed plugins
rely on it, it makes no difference since it is not being called, if they do
something like $this->config_save or parent::config_save somewhere in their
block class instance, this will still work as deprecated function will handle
it.

6 years agoMDL-47729 repository_filesystem: smarter sync of references
Marina Glancy [Fri, 13 Mar 2015 03:01:02 +0000 (11:01 +0800)]
MDL-47729 repository_filesystem: smarter sync of references

It was noticed that if file content was once imported the following
synchronisations do not discover the changes

6 years agoweekly release 2.9dev
David Monllao [Fri, 13 Mar 2015 02:27:23 +0000 (10:27 +0800)]
weekly release 2.9dev

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Fri, 13 Mar 2015 02:27:21 +0000 (10:27 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMerge branch 'MDL-48943-master-arialive' of git://github.com/andrewnicols/moodle
David Monllao [Fri, 13 Mar 2015 02:15:29 +0000 (10:15 +0800)]
Merge branch 'MDL-48943-master-arialive' of git://github.com/andrewnicols/moodle

6 years agoMDL-19670 mod_forum: Allow user to post a copy to all accessible groups
Dave Cooper [Fri, 6 Feb 2015 06:50:19 +0000 (14:50 +0800)]
MDL-19670 mod_forum: Allow user to post a copy to all accessible groups

6 years agoMDL-19670 mod_forum: Add tests for posting to multiple discussions
Dave Cooper [Tue, 10 Feb 2015 08:33:36 +0000 (16:33 +0800)]
MDL-19670 mod_forum: Add tests for posting to multiple discussions

6 years agoMerge branch 'MDL-48595_master-test-fix' of git://github.com/dmonllao/moodle
Dan Poltawski [Thu, 12 Mar 2015 08:03:15 +0000 (08:03 +0000)]
Merge branch 'MDL-48595_master-test-fix' of git://github.com/dmonllao/moodle

6 years agoMerge branch 'wip-mdl-48595' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Thu, 12 Mar 2015 08:03:11 +0000 (08:03 +0000)]
Merge branch 'wip-mdl-48595' of git://github.com/rajeshtaneja/moodle

6 years agoMDL-49163 Webservices, AJAX: Add support for a new ajax webservice handler.
Damyon Wiese [Sun, 22 Feb 2015 06:56:50 +0000 (14:56 +0800)]
MDL-49163 Webservices, AJAX: Add support for a new ajax webservice handler.

This is a new script that can call any function in the built-in AJAX webservice. This is
a new system service that is added at install time (like the mobile webservice). It has no
protocols added to it, but it accessible by a new ajax script /lib/ajax/service.php.

Requests and responses to the script are required to be in json format, and multiple functions can
be called in a single request.

6 years agoMDL-48595 logstore_standard: Fixing unit tests comparing performance
David Monllao [Thu, 12 Mar 2015 05:52:17 +0000 (13:52 +0800)]
MDL-48595 logstore_standard: Fixing unit tests comparing performance

Adding also an extra userid checking as databases
may include userid = 0 records.

6 years agoMDL-48595 core_stats: get time everytime it's used
Rajesh Taneja [Thu, 12 Mar 2015 04:49:44 +0000 (12:49 +0800)]
MDL-48595 core_stats: get time everytime it's used

Depending on server speed, time might be more then
expected. So rather then using variable, get current
time where required

6 years agoMDL-48943 calendar: Remove aria-live when showing
Andrew Nicols [Thu, 12 Mar 2015 01:41:26 +0000 (09:41 +0800)]
MDL-48943 calendar: Remove aria-live when showing

6 years agoMDL-48943 calendar: des@arn-izating acceptance tests
Eloy Lafuente (stronk7) [Wed, 11 Mar 2015 11:46:23 +0000 (12:46 +0100)]
MDL-48943 calendar: des@arn-izating acceptance tests

6 years agoMerge branch 'MDL-49094-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 11 Mar 2015 11:36:34 +0000 (12:36 +0100)]
Merge branch 'MDL-49094-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-48943-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 11 Mar 2015 11:02:49 +0000 (12:02 +0100)]
Merge branch 'MDL-48943-master' of git://github.com/andrewnicols/moodle

6 years agoMDL-49224 tooL_generator: fallback to "Test course <x>" when no fullname specified
Jetha Chan [Wed, 11 Mar 2015 06:36:41 +0000 (14:36 +0800)]
MDL-49224 tooL_generator: fallback to "Test course <x>" when no fullname specified

6 years agoMDL-49269 javascript: Set default loglevel to warn
Andrew Nicols [Wed, 11 Mar 2015 04:18:20 +0000 (12:18 +0800)]
MDL-49269 javascript: Set default loglevel to warn

6 years agoMDL-44367 filter_data: Adding basic unit tests
David Monllao [Mon, 19 Jan 2015 07:14:52 +0000 (15:14 +0800)]
MDL-44367 filter_data: Adding basic unit tests

6 years agoMDL-44367 filter_data: Moving cache at course level
David Monllao [Mon, 19 Jan 2015 06:08:19 +0000 (14:08 +0800)]
MDL-44367 filter_data: Moving cache at course level

6 years agoMDL-49298 admin: Adding upgrade.txt info about enabletgzbackups
David Monllao [Wed, 11 Mar 2015 00:41:22 +0000 (08:41 +0800)]
MDL-49298 admin: Adding upgrade.txt info about enabletgzbackups

6 years agoMerge branch 'MDL-49298-master' of git://github.com/merrill-oakland/moodle
David Monllao [Wed, 11 Mar 2015 00:33:23 +0000 (08:33 +0800)]
Merge branch 'MDL-49298-master' of git://github.com/merrill-oakland/moodle

Conflicts:
version.php

6 years agoMerge branch 'MDL-49315' of git://github.com/timhunt/moodle
David Monllao [Wed, 11 Mar 2015 00:28:02 +0000 (08:28 +0800)]
Merge branch 'MDL-49315' of git://github.com/timhunt/moodle

6 years agoMerge branch 'MDL-49269-master' of git://github.com/andrewnicols/moodle
David Monllao [Wed, 11 Mar 2015 00:23:30 +0000 (08:23 +0800)]
Merge branch 'MDL-49269-master' of git://github.com/andrewnicols/moodle

6 years agoMDL-49269 javascript: Add log, and loglevel amd modules
Andrew Nicols [Thu, 26 Feb 2015 03:30:58 +0000 (11:30 +0800)]
MDL-49269 javascript: Add log, and loglevel amd modules

6 years agoMerge branch 'MDL-49069' of git://github.com/rlorenzo/moodle
David Monllao [Wed, 11 Mar 2015 00:17:29 +0000 (08:17 +0800)]
Merge branch 'MDL-49069' of git://github.com/rlorenzo/moodle

6 years agoMerge branch 'MDL-49159' of https://github.com/spvickers/moodle
Eloy Lafuente (stronk7) [Tue, 10 Mar 2015 23:17:37 +0000 (00:17 +0100)]
Merge branch 'MDL-49159' of https://github.com/spvickers/moodle

6 years agoMerge branch 'MDL-49224-master' of git://github.com/jethac/moodle
Eloy Lafuente (stronk7) [Tue, 10 Mar 2015 23:16:01 +0000 (00:16 +0100)]
Merge branch 'MDL-49224-master' of git://github.com/jethac/moodle

6 years agoMerge branch 'MDL-49242-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 10 Mar 2015 23:11:56 +0000 (00:11 +0100)]
Merge branch 'MDL-49242-master' of git://github.com/jleyva/moodle

6 years agoMDL-49069 mod_forum: Ability to specify default values for Forum RSS
Rex Lorenzo [Wed, 18 Feb 2015 00:23:05 +0000 (16:23 -0800)]
MDL-49069 mod_forum: Ability to specify default values for Forum RSS

6 years agoAutomatically generated installer lang files
AMOS bot [Tue, 10 Mar 2015 16:04:00 +0000 (00:04 +0800)]
Automatically generated installer lang files

6 years agoMDL-39752 fix whitespace errors
Dan Poltawski [Tue, 10 Mar 2015 14:13:20 +0000 (14:13 +0000)]
MDL-39752 fix whitespace errors

(And some others unrelated to above issue, because its spring and i'm
cleaning).

6 years agoMDL-39752 behat: Return proper behat dir if config set
Rajesh Taneja [Tue, 10 Mar 2015 13:42:11 +0000 (21:42 +0800)]
MDL-39752 behat: Return proper behat dir if config set

6 years agoMDL-48595 upgrade.txt: just add some rationale explaining change
Dan Poltawski [Tue, 10 Mar 2015 10:00:40 +0000 (10:00 +0000)]
MDL-48595 upgrade.txt: just add some rationale explaining change

6 years agoMerge branch 'MDL-48595_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 10 Mar 2015 09:59:28 +0000 (09:59 +0000)]
Merge branch 'MDL-48595_master' of git://github.com/dmonllao/moodle

Conflicts:
version.php

6 years agoMerge branch 'MDL-49256-master' of git://github.com/andrewnicols/moodle
David Monllao [Tue, 10 Mar 2015 09:42:35 +0000 (17:42 +0800)]
Merge branch 'MDL-49256-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

6 years agoMerge branch 'wip-mdl-49402' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 10 Mar 2015 08:33:37 +0000 (08:33 +0000)]
Merge branch 'wip-mdl-49402' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-48682_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 10 Mar 2015 08:25:30 +0000 (08:25 +0000)]
Merge branch 'MDL-48682_master' of git://github.com/dmonllao/moodle