moodle.git
5 years agoMerge branch 'MDL-52523' of git://github.com/timhunt/moodle
David Monllao [Mon, 21 Dec 2015 02:47:49 +0000 (10:47 +0800)]
Merge branch 'MDL-52523' of git://github.com/timhunt/moodle

5 years agoweekly release 3.1dev
Dan Poltawski [Fri, 18 Dec 2015 12:26:50 +0000 (12:26 +0000)]
weekly release 3.1dev

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

5 years agoMerge branch 'MDL-52553_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Fri, 18 Dec 2015 10:51:01 +0000 (10:51 +0000)]
Merge branch 'MDL-52553_master' of git://github.com/dmonllao/moodle

5 years agoMDL-52553 question: Adding missing required constants
David Monllao [Fri, 18 Dec 2015 05:37:06 +0000 (13:37 +0800)]
MDL-52553 question: Adding missing required constants

5 years agoMerge branch 'wip-mdl-52540' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Thu, 17 Dec 2015 09:18:34 +0000 (10:18 +0100)]
Merge branch 'wip-mdl-52540' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-52540 behat: mouse events are not handled well with phantomjs
Rajesh Taneja [Thu, 17 Dec 2015 04:05:19 +0000 (12:05 +0800)]
MDL-52540 behat: mouse events are not handled well with phantomjs

5 years agoMDL-52523 backup of subplugins: add missing global
Tim Hunt [Tue, 15 Dec 2015 15:57:23 +0000 (15:57 +0000)]
MDL-52523 backup of subplugins: add missing global

5 years agoMDL-52286 core: mute erros in adodb destructor
Marina Glancy [Tue, 15 Dec 2015 04:36:02 +0000 (12:36 +0800)]
MDL-52286 core: mute erros in adodb destructor

5 years agoAutomatically generated installer lang files
AMOS bot [Mon, 14 Dec 2015 16:03:58 +0000 (00:03 +0800)]
Automatically generated installer lang files

5 years agoMerge branch 'MDL-52451-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 14 Dec 2015 10:46:29 +0000 (10:46 +0000)]
Merge branch 'MDL-52451-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'wip-MDL-52286-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 14 Dec 2015 10:23:28 +0000 (10:23 +0000)]
Merge branch 'wip-MDL-52286-master' of https://github.com/marinaglancy/moodle

5 years agoMDL-52286 core: corrected version of adodb to 5.20.1
Marina Glancy [Mon, 14 Dec 2015 10:06:43 +0000 (18:06 +0800)]
MDL-52286 core: corrected version of adodb to 5.20.1

5 years agoMDL-52286 core: several fixes to ADOdb
Marina Glancy [Mon, 14 Dec 2015 03:01:53 +0000 (11:01 +0800)]
MDL-52286 core: several fixes to ADOdb

5 years agoMerge branch 'MDL-52499-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 14 Dec 2015 09:44:16 +0000 (09:44 +0000)]
Merge branch 'MDL-52499-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-52487_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 14 Dec 2015 09:23:03 +0000 (09:23 +0000)]
Merge branch 'MDL-52487_master' of git://github.com/dmonllao/moodle

5 years agoMDL-52487 rss: PHP 7 compatible error supression
David Monllao [Mon, 14 Dec 2015 06:53:07 +0000 (14:53 +0800)]
MDL-52487 rss: PHP 7 compatible error supression

PHP5 used to update error_reporting to 0 on functions called with the
suppress errors operator (@). In PHP7 it is not updated.

Credit to Rajesh Taneja.

5 years agoMDL-52499 core: link to php7 documentation
Marina Glancy [Mon, 14 Dec 2015 04:51:20 +0000 (12:51 +0800)]
MDL-52499 core: link to php7 documentation

5 years agoMDL-52451 forms: replace deprecated function
Marina Glancy [Mon, 14 Dec 2015 04:43:03 +0000 (12:43 +0800)]
MDL-52451 forms: replace deprecated function

5 years agoMerge branch 'wip-MDL-52286-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Fri, 11 Dec 2015 08:57:57 +0000 (08:57 +0000)]
Merge branch 'wip-MDL-52286-master' of https://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-52472-master' of git://github.com/danpoltawski/moodle
David Monllao [Fri, 11 Dec 2015 08:02:46 +0000 (16:02 +0800)]
Merge branch 'MDL-52472-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-52361-master' of git://github.com/marinaglancy/moodle
David Monllao [Fri, 11 Dec 2015 06:49:15 +0000 (14:49 +0800)]
Merge branch 'MDL-52361-master' of git://github.com/marinaglancy/moodle

5 years agoMDL-51784 general: Adding missing php4 style constructors
David Monllao [Fri, 11 Dec 2015 05:52:17 +0000 (13:52 +0800)]
MDL-51784 general: Adding missing php4 style constructors

Adding them to warn people calling the php4 constructor.

5 years agoMDL-51784 various: use __construct() for PHP7 compatibility
Marina Glancy [Thu, 26 Nov 2015 02:49:58 +0000 (10:49 +0800)]
MDL-51784 various: use __construct() for PHP7 compatibility

5 years agoMerge branch 'MDL-52471-master' of git://github.com/danpoltawski/moodle
David Monllao [Fri, 11 Dec 2015 03:52:02 +0000 (11:52 +0800)]
Merge branch 'MDL-52471-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'wip-MDL-52475-master' of git://github.com/marinaglancy/moodle
David Monllao [Fri, 11 Dec 2015 03:23:41 +0000 (11:23 +0800)]
Merge branch 'wip-MDL-52475-master' of git://github.com/marinaglancy/moodle

5 years agoMDL-52475 core: workaround PHP7 bug #70110 with preg_match
Tony Levi [Fri, 11 Dec 2015 00:27:26 +0000 (08:27 +0800)]
MDL-52475 core: workaround PHP7 bug #70110 with preg_match

5 years agoMDL-52081 general: whitespace fix
Eloy Lafuente (stronk7) [Thu, 10 Dec 2015 21:39:25 +0000 (22:39 +0100)]
MDL-52081 general: whitespace fix

5 years agoMDL-52472 travis: remove mongo/memcached testing
Dan Poltawski [Thu, 10 Dec 2015 17:32:33 +0000 (17:32 +0000)]
MDL-52472 travis: remove mongo/memcached testing

At the moment the extensions aren't available in php7 env:
https://github.com/travis-ci/travis-ci/issues/5256

And really its probably not worth the effort/buildtime to
enable them IMO so simpler to just disable.

5 years agoMDL-52471 tests: simplify setup code
Dan Poltawski [Thu, 10 Dec 2015 14:50:54 +0000 (14:50 +0000)]
MDL-52471 tests: simplify setup code

Test code was not using the generator for simple enrollments, couldn't
help to fix when noticed.

5 years agoMDL-52471 completion: fix deprecated use of 'object'
Dan Poltawski [Thu, 10 Dec 2015 14:45:57 +0000 (14:45 +0000)]
MDL-52471 completion: fix deprecated use of 'object'

And add a unit test covering completion_can_view_data() without
full course object passed.

5 years agoMDL-52471 quiz: remove broken code question_print_comment_fields()
Dan Poltawski [Thu, 10 Dec 2015 14:18:11 +0000 (14:18 +0000)]
MDL-52471 quiz: remove broken code question_print_comment_fields()

5 years agoMerge branch 'MDL-52284-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Thu, 10 Dec 2015 15:16:20 +0000 (16:16 +0100)]
Merge branch 'MDL-52284-master' of git://github.com/marinaglancy/moodle

5 years agoMDL-52471 setuplib: depreciate class object properly
Dan Poltawski [Thu, 10 Dec 2015 14:25:20 +0000 (14:25 +0000)]
MDL-52471 setuplib: depreciate class object properly

Previously was marked depricated but not throwwing debugging

5 years agoMDL-52472 travis: enable php7
Dan Poltawski [Thu, 10 Dec 2015 07:50:23 +0000 (07:50 +0000)]
MDL-52472 travis: enable php7

Relegate 5.6 runs (following the principle of highest and lowest version
only, to conserve travis resources and get faster test completions)

5 years agoMerge branch 'MDL-52333_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Thu, 10 Dec 2015 11:03:50 +0000 (11:03 +0000)]
Merge branch 'MDL-52333_master' of git://github.com/dmonllao/moodle

5 years agoMDL-52285 auth: Add constructors for backwards compat
Dan Poltawski [Thu, 10 Dec 2015 10:17:58 +0000 (10:17 +0000)]
MDL-52285 auth: Add constructors for backwards compat

These are very unlikely to be used but just to be safe..

5 years agoMerge branch 'wip-MDL-52285-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 10 Dec 2015 10:13:40 +0000 (10:13 +0000)]
Merge branch 'wip-MDL-52285-master' of git://github.com/marinaglancy/moodle

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

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

5 years agoMDL-52333: qtype_calculated: Adding division by zero test
David Monllao [Thu, 10 Dec 2015 08:37:48 +0000 (16:37 +0800)]
MDL-52333: qtype_calculated: Adding division by zero test

5 years agoMDL-52333 qtype: PHP7-compatibility in calculate_raw()
Tony Levi [Mon, 3 Aug 2015 06:46:03 +0000 (16:16 +0930)]
MDL-52333 qtype: PHP7-compatibility in calculate_raw()

Code also modified by Tim Hunt

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 agoMDL-52285 auth: use __construct() for constructors
Marina Glancy [Fri, 27 Nov 2015 01:01:25 +0000 (09:01 +0800)]
MDL-52285 auth: use __construct() for constructors

5 years agoMDL-52081 forms: indicate usage of grandparent constructor
Marina Glancy [Thu, 10 Dec 2015 05:37:57 +0000 (13:37 +0800)]
MDL-52081 forms: indicate usage of grandparent constructor

5 years agoMDL-52081 forms: Use __construct() for constructors
Marina Glancy [Thu, 5 Nov 2015 09:01:34 +0000 (17:01 +0800)]
MDL-52081 forms: Use __construct() for constructors

5 years agoMDL-52284 core: PHP7 engine errors have type Throwable
Marina Glancy [Wed, 9 Dec 2015 03:55:58 +0000 (11:55 +0800)]
MDL-52284 core: PHP7 engine errors have type Throwable

5 years agoMDL-52284 core: compatibility with Exception/Throwable changes in PHP7
Tony Levi [Mon, 3 Aug 2015 06:46:03 +0000 (16:16 +0930)]
MDL-52284 core: compatibility with Exception/Throwable changes in PHP7

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 agoMDL-52361 core: patch Horde library for PHP7 compatibility
Marina Glancy [Tue, 8 Dec 2015 04:47:15 +0000 (12:47 +0800)]
MDL-52361 core: patch Horde library for PHP7 compatibility

5 years agoMDL-52336 core: patch PHPExcel for PHP7 compatibility
Marina Glancy [Tue, 8 Dec 2015 04:13:48 +0000 (12:13 +0800)]
MDL-52336 core: patch PHPExcel for PHP7 compatibility

5 years agoMDL-52286 core: update ADODB library to 5.21
Marina Glancy [Tue, 8 Dec 2015 03:52:40 +0000 (11:52 +0800)]
MDL-52286 core: update ADODB library to 5.21

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