moodle.git
5 years agoMerge branch 'MDL-52335-master' of git://github.com/marinaglancy/moodle
David Monllao [Thu, 10 Dec 2015 07:47:14 +0000 (15:47 +0800)]
Merge branch 'MDL-52335-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-52438-master' of git://github.com/marinaglancy/moodle
David Monllao [Thu, 10 Dec 2015 07:31:29 +0000 (15:31 +0800)]
Merge branch 'MDL-52438-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-52312_master' of git://github.com/markn86/moodle
David Monllao [Thu, 10 Dec 2015 05:56:08 +0000 (13:56 +0800)]
Merge branch 'MDL-52312_master' of git://github.com/markn86/moodle

5 years agoweekly release 3.1dev
Dan Poltawski [Wed, 9 Dec 2015 12:09:28 +0000 (12:09 +0000)]
weekly release 3.1dev

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Wed, 9 Dec 2015 12:09:26 +0000 (12:09 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

5 years agoMDL-52209 webservice: upgrade.txt tweak
Dan Poltawski [Wed, 9 Dec 2015 09:45:13 +0000 (09:45 +0000)]
MDL-52209 webservice: upgrade.txt tweak

5 years agoMDL-52209 webservice_xmlrpc: Remove Zend from webservice_xmlrpc
Jun Pataleta [Wed, 9 Dec 2015 08:58:12 +0000 (02:58 -0600)]
MDL-52209 webservice_xmlrpc: Remove Zend from webservice_xmlrpc

Additional fixes.

5 years agoMDL-51698 user: Adapting behat test
David Monllao [Wed, 9 Dec 2015 05:22:38 +0000 (13:22 +0800)]
MDL-51698 user: Adapting behat test

Using the generic .breadcrumb-nav like in edit_tag.feature as the elements
on it are quite generic and there is no much chance of future conflicts.

5 years agoMerge branch 'MDL-51483_master' of https://github.com/jinhofer/moodle
Eloy Lafuente (stronk7) [Wed, 9 Dec 2015 00:09:08 +0000 (01:09 +0100)]
Merge branch 'MDL-51483_master' of https://github.com/jinhofer/moodle

5 years agoMDL-51698 upgrade: bump version to newer than rewritten one
Eloy Lafuente (stronk7) [Tue, 8 Dec 2015 23:51:40 +0000 (00:51 +0100)]
MDL-51698 upgrade: bump version to newer than rewritten one

Some integration.git based sites can have 2015120801 version,
now rewritten. This commit ensures everybody goes forward to
2015120803.

5 years agoMDL-51698 navigationlib: Add crumb trail meta data
Brendan Heywood [Mon, 12 Oct 2015 06:11:28 +0000 (17:11 +1100)]
MDL-51698 navigationlib: Add crumb trail meta data

5 years agoMerge branch 'MDL-51097_m31v1' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 8 Dec 2015 10:34:44 +0000 (10:34 +0000)]
Merge branch 'MDL-51097_m31v1' of https://github.com/sbourget/moodle

5 years agoMerge branch 'MDL-51411' of https://github.com/andrewhancox/moodle
Dan Poltawski [Tue, 8 Dec 2015 09:05:45 +0000 (09:05 +0000)]
Merge branch 'MDL-51411' of https://github.com/andrewhancox/moodle

5 years agoMerge branch 'MDL-52165-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 8 Dec 2015 08:51:34 +0000 (08:51 +0000)]
Merge branch 'MDL-52165-master' of git://github.com/jleyva/moodle

5 years agoMDL-52438 core: allow Moodle 3.0 to be used with PHP7
Marina Glancy [Tue, 8 Dec 2015 04:54:32 +0000 (12:54 +0800)]
MDL-52438 core: allow Moodle 3.0 to be used with PHP7

5 years agoMerge branch 'MDL-50550-master' of git://github.com/dpalou/moodle
David Monllao [Tue, 8 Dec 2015 03:32:39 +0000 (11:32 +0800)]
Merge branch 'MDL-50550-master' of git://github.com/dpalou/moodle

Conflicts:
lib/db/services.php
version.php

5 years agoMerge branch 'wip-MDL-52193-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 7 Dec 2015 15:36:55 +0000 (15:36 +0000)]
Merge branch 'wip-MDL-52193-master' of https://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-52209-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 7 Dec 2015 15:04:40 +0000 (15:04 +0000)]
Merge branch 'MDL-52209-master' of git://github.com/junpataleta/moodle

5 years agoMDL-52312 assignfeedback_editpdf: changes to files after FPDI update
Mark Nelson [Fri, 4 Dec 2015 12:12:49 +0000 (20:12 +0800)]
MDL-52312 assignfeedback_editpdf: changes to files after FPDI update

1) Change the fpdi_bridge class so that it extends the pdf class,
rather than the TCPDF class.
2) Updated the editpdf/fpdi/readme_moodle.txt file to document the changes.
3) Updated the editpdf/thirdpartylibs.xml to reflect the update to the
FPDI library.

5 years agoMerge branch 'MDL-50258_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 7 Dec 2015 09:04:35 +0000 (09:04 +0000)]
Merge branch 'MDL-50258_master' of git://github.com/dmonllao/moodle

5 years agoMerge branch 'MDL-52204-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 7 Dec 2015 08:30:38 +0000 (16:30 +0800)]
Merge branch 'MDL-52204-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-52304_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Mon, 7 Dec 2015 08:20:10 +0000 (08:20 +0000)]
Merge branch 'MDL-52304_master' of https://github.com/dmonllao/moodle

5 years agoMDL-52271 install: don't allow installer to be indexed
Dan Poltawski [Mon, 23 Nov 2015 10:14:15 +0000 (10:14 +0000)]
MDL-52271 install: don't allow installer to be indexed

Following guidance from:
https://support.google.com/webmasters/answer/93710?hl=en

5 years agoMerge branch 'MDL-52370-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 7 Dec 2015 07:01:42 +0000 (15:01 +0800)]
Merge branch 'MDL-52370-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-50540-master' of git://github.com/FMCorz/moodle
David Monllao [Mon, 7 Dec 2015 06:41:20 +0000 (14:41 +0800)]
Merge branch 'MDL-50540-master' of git://github.com/FMCorz/moodle

5 years agoMDL-50540 mod_glossary: Final clean up of new external function
Frederic Massart [Tue, 6 Oct 2015 04:27:24 +0000 (12:27 +0800)]
MDL-50540 mod_glossary: Final clean up of new external function

5 years agoMDL-50540 glossary: Unit test for mod_glossary_get_glossaries_by_courses
Costantino Cito [Mon, 22 Jun 2015 15:01:15 +0000 (17:01 +0200)]
MDL-50540 glossary: Unit test for mod_glossary_get_glossaries_by_courses

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 agoMDL-52312 assignfeedback_editpdf: updated the FPDI libary to 1.6.1
Mark Nelson [Fri, 4 Dec 2015 12:07:23 +0000 (20:07 +0800)]
MDL-52312 assignfeedback_editpdf: updated the FPDI libary to 1.6.1

5 years agoMDL-51582 readme: update less building instructions
Dan Poltawski [Fri, 4 Dec 2015 16:40:21 +0000 (16:40 +0000)]
MDL-51582 readme: update less building instructions

I forgot to update this after the changes in 65d070a

5 years agoMerge branch 'MDL-51582-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Fri, 4 Dec 2015 16:15:13 +0000 (17:15 +0100)]
Merge branch 'MDL-51582-master' of git://github.com/danpoltawski/moodle

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

5 years agoMDL-52165 mod_forum: New Web Service mod_forum_can_add_discussion
Juan Leyva [Mon, 16 Nov 2015 14:30:55 +0000 (15:30 +0100)]
MDL-52165 mod_forum: New Web Service mod_forum_can_add_discussion

5 years agoMDL-52209 webservice_xmlrpc: Remove Zend from webservice_xmlrpc
Jun Pataleta [Fri, 20 Nov 2015 20:54:24 +0000 (14:54 -0600)]
MDL-52209 webservice_xmlrpc: Remove Zend from webservice_xmlrpc

5 years agoMDL-50550 wiki: Added unit tests for mod_wiki_get_wikis_by_courses
Dani Palou [Thu, 22 Oct 2015 11:02:39 +0000 (13:02 +0200)]
MDL-50550 wiki: Added unit tests for mod_wiki_get_wikis_by_courses

5 years agoMDL-50550 wiki: New WS mod_wiki_get_wikis_by_courses
Dani Palou [Thu, 22 Oct 2015 10:33:13 +0000 (12:33 +0200)]
MDL-50550 wiki: New WS mod_wiki_get_wikis_by_courses

5 years agoMDL-52204 grunt: update to grunt-contrib-jshint v0.11.3
Dan Poltawski [Fri, 27 Nov 2015 15:21:42 +0000 (15:21 +0000)]
MDL-52204 grunt: update to grunt-contrib-jshint v0.11.3

This version of grunt-contrib-jshint itself uses a better fixed
requirement on "~2.8.0" rather than "^2.8.0" which was giving variable
results with some people updating to 2.9-rc1.

See also https://github.com/gruntjs/grunt-contrib-jshint/pull/219

5 years agoMDL-52204 js: fix 'used before defined' errors
Dan Poltawski [Fri, 27 Nov 2015 15:13:56 +0000 (15:13 +0000)]
MDL-52204 js: fix 'used before defined' errors

Newer versions of jshint detect this coding error, we fix it
by simply reordering the definition of methods.

5 years agoMDL-51582 grunt: task improvements
Dan Poltawski [Tue, 24 Nov 2015 18:13:02 +0000 (18:13 +0000)]
MDL-51582 grunt: task improvements

* Introduce the 'css' task - this will give us flexibility to do things
  in future rather than relying on the inbuilt 'less' task (e.g. sourcemap
  generating task which doesn't run by default)

* Introduce 'amd' task which runs only amd tasks

* Introduce 'js' task which runs all JS (amd/shifter) tasks

* Tweak the ordering so that slow shifter always runs last (useful for
  people like me who forget to specif the task)

5 years agoMDL-51582 css: built with new grunt task
Dan Poltawski [Fri, 20 Nov 2015 10:38:48 +0000 (10:38 +0000)]
MDL-51582 css: built with new grunt task

5 years agoMDL-51582 grunt: add less complilation support
Dan Poltawski [Fri, 20 Nov 2015 10:35:11 +0000 (10:35 +0000)]
MDL-51582 grunt: add less complilation support

Previously we were using recess to build bootstrap base as it was what
was used by the original project. But recess is no longer maintained.

Now we use grunt for building js, it makes sense to use it for less too.

(If you really don't want to use grunt, you almost certainly can just
use lessc -x as it uses the same less.js on backend).

5 years agoMDL-52304 media: Allow full screen in Flash player
Michael Aherne [Wed, 25 Nov 2015 10:18:35 +0000 (10:18 +0000)]
MDL-52304 media: Allow full screen in Flash player

5 years agoMDL-50258 themes: Fix CSS source maps
David Monllao [Thu, 26 Nov 2015 04:41:36 +0000 (12:41 +0800)]
MDL-50258 themes: Fix CSS source maps

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 agoMDL-51483 lib/moodlelib.php: Added conditional checks to shorten_text
jinhofer [Fri, 13 Nov 2015 23:25:35 +0000 (17:25 -0600)]
MDL-51483 lib/moodlelib.php: Added conditional checks to shorten_text

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-52335 tool_uploaduser: php7 compatibility in variable syntax
Marina Glancy [Thu, 3 Dec 2015 01:28:08 +0000 (09:28 +0800)]
MDL-52335 tool_uploaduser: php7 compatibility in variable syntax

5 years agoMDL-52335 mod_data: php7 compatibility in variable syntax
Marina Glancy [Wed, 2 Dec 2015 06:01:53 +0000 (14:01 +0800)]
MDL-52335 mod_data: php7 compatibility in variable syntax

5 years agoMDL-52335 mod_lti: php7 compatibility in variable syntax
Marina Glancy [Wed, 2 Dec 2015 06:01:33 +0000 (14:01 +0800)]
MDL-52335 mod_lti: php7 compatibility in variable syntax

5 years agoMDL-52335 core: php7 compatibility in XMPP library
Marina Glancy [Wed, 2 Dec 2015 06:00:58 +0000 (14:00 +0800)]
MDL-52335 core: php7 compatibility in XMPP library

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-52370 role: purge coursecontacts when role is edited
Dan Poltawski [Tue, 1 Dec 2015 13:12:34 +0000 (13:12 +0000)]
MDL-52370 role: purge coursecontacts when role is edited

This is perhaps a bit more brutal purge than you'd like, but it only
affects coursecat role edits.

5 years agoMDL-52370 course: purge contacts cache on role rename
Dan Poltawski [Tue, 1 Dec 2015 12:43:32 +0000 (12:43 +0000)]
MDL-52370 course: purge contacts cache on role rename

Previously teachers would rename roles and the change would not be
reflected in course listings.

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