moodle.git
8 years agoMerge branch 'MDL-25473-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 16 Dec 2013 19:54:33 +0000 (08:54 +1300)]
Merge branch 'MDL-25473-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'MDL-34321-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 16 Dec 2013 19:48:08 +0000 (08:48 +1300)]
Merge branch 'MDL-34321-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'MDL-36984-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 16 Dec 2013 19:45:05 +0000 (08:45 +1300)]
Merge branch 'MDL-36984-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'w51_MDL-43268_m27_filternotice' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 16 Dec 2013 19:25:08 +0000 (08:25 +1300)]
Merge branch 'w51_MDL-43268_m27_filternotice' of https://github.com/skodak/moodle

8 years agoMDL-43322 JavaScript: Correct cache-base entry in base rollup
Andrew Nicols [Mon, 16 Dec 2013 08:59:11 +0000 (16:59 +0800)]
MDL-43322 JavaScript: Correct cache-base entry in base rollup

8 years agoMDL-43322 JavaScript: Include moodle-core-popuphelp in the mcore rollup
Andrew Nicols [Wed, 11 Dec 2013 01:34:36 +0000 (09:34 +0800)]
MDL-43322 JavaScript: Include moodle-core-popuphelp in the mcore rollup

moodle-core-popuphelp is used on every page in Moodle, so it should be
included in the rollup by default to save a request each time.

8 years agoMerge branch 'MDL-43240-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 16 Dec 2013 03:03:09 +0000 (16:03 +1300)]
Merge branch 'MDL-43240-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-34432-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 16 Dec 2013 02:46:56 +0000 (15:46 +1300)]
Merge branch 'MDL-34432-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'wip-mdl-21180' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 16 Dec 2013 02:44:15 +0000 (15:44 +1300)]
Merge branch 'wip-mdl-21180' of https://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-43062-master-nomerge' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 16 Dec 2013 02:40:40 +0000 (15:40 +1300)]
Merge branch 'MDL-43062-master-nomerge' of git://github.com/mouneyrac/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMDL-34432: Allow comment inline (stripping embedded images version)
Damyon Wiese [Tue, 10 Dec 2013 03:46:33 +0000 (11:46 +0800)]
MDL-34432: Allow comment inline (stripping embedded images version)

8 years agoMDL-21180 Gradebook: Consistent handling of change in aggregation
Rajesh Taneja [Thu, 12 Dec 2013 01:53:48 +0000 (09:53 +0800)]
MDL-21180 Gradebook: Consistent handling of change in aggregation

Change from/to GRADE_AGGREGATE_WEIGHTED_MEAN and GRADE_AGGREGATE_EXTRACREDIT_MEAN was only
handled prior to this patch. GRADE_AGGREGATE_SUM and GRADE_AGGREGATE_WEIGHTED_MEAN2 also
behave similar and should be handled same way

8 years agoMerge branch 'MDL-37972-master' of git://github.com/phalacee/moodle
Marina Glancy [Mon, 16 Dec 2013 01:27:38 +0000 (12:27 +1100)]
Merge branch 'MDL-37972-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'wip-MDL-43348_master' of git://github.com/gjb2048/moodle
Sam Hemelryk [Mon, 16 Dec 2013 01:10:15 +0000 (14:10 +1300)]
Merge branch 'wip-MDL-43348_master' of git://github.com/gjb2048/moodle

8 years agoMerge branch 'MDL-40096-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 16 Dec 2013 00:52:16 +0000 (13:52 +1300)]
Merge branch 'MDL-40096-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-42965_master' of https://github.com/totara/openbadges
Sam Hemelryk [Mon, 16 Dec 2013 00:47:57 +0000 (13:47 +1300)]
Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges

8 years agoMerge branch 'MDL-40436-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 15 Dec 2013 22:31:29 +0000 (11:31 +1300)]
Merge branch 'MDL-40436-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'w51_MDL-42931_m27_env27' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 15 Dec 2013 22:18:02 +0000 (11:18 +1300)]
Merge branch 'w51_MDL-42931_m27_env27' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-42085-master' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Sun, 15 Dec 2013 22:11:38 +0000 (11:11 +1300)]
Merge branch 'MDL-42085-master' of git://github.com/mouneyrac/moodle

8 years agoMerge branch 'MDL-43326-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 15 Dec 2013 20:46:47 +0000 (09:46 +1300)]
Merge branch 'MDL-43326-master' of git://github.com/damyon/moodle

8 years agoMDL-42931 fix hardcoded PHP version tests for 2.7
Petr Škoda [Tue, 10 Dec 2013 00:46:27 +0000 (08:46 +0800)]
MDL-42931 fix hardcoded PHP version tests for 2.7

8 years agoMDL-42931 set new requirements for 2.7
Petr Škoda [Tue, 10 Dec 2013 00:40:33 +0000 (08:40 +0800)]
MDL-42931 set new requirements for 2.7

8 years agoMDL-43268 fix filter notice when not in debug mode
Petr Škoda [Fri, 13 Dec 2013 00:15:21 +0000 (08:15 +0800)]
MDL-43268 fix filter notice when not in debug mode

8 years agoMDL-43062 course: Content of label is left-aligned, regardless of alignment chosen
Jerome Mouneyrac [Fri, 13 Dec 2013 05:27:26 +0000 (13:27 +0800)]
MDL-43062 course: Content of label is left-aligned, regardless of alignment chosen

8 years agoweekly release 2.7dev
Sam Hemelryk [Fri, 13 Dec 2013 03:59:10 +0000 (16:59 +1300)]
weekly release 2.7dev

8 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Sam Hemelryk [Fri, 13 Dec 2013 03:59:08 +0000 (16:59 +1300)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

8 years agoAutomatically generated installer lang files
AMOS bot [Fri, 13 Dec 2013 00:42:11 +0000 (00:42 +0000)]
Automatically generated installer lang files

8 years agoMDL-33925: auth_imap: add self-signed cert support
Tim Lock [Wed, 4 Dec 2013 04:12:49 +0000 (14:42 +1030)]
MDL-33925: auth_imap: add self-signed cert support

8 years agoMDL-42625 behat: Wrapping select an option extra actions in a try & catch
David Monllao [Thu, 12 Dec 2013 08:38:25 +0000 (16:38 +0800)]
MDL-42625 behat: Wrapping select an option extra actions in a try & catch

To select an option is specially painful, every browser
behaves differently and phantomjs just joined the party
throwing "Element does not exist in cache" random
exceptions that we need to catch.

8 years agoMDL-43348 theme: html <nav> element on the wrong content.
Gareth J Barnard [Thu, 12 Dec 2013 11:07:03 +0000 (11:07 +0000)]
MDL-43348 theme: html <nav> element on the wrong content.

8 years agoMDL-42085 Enrol: Always apply enrolment duration.
Jerome Mouneyrac [Thu, 12 Dec 2013 08:04:52 +0000 (16:04 +0800)]
MDL-42085 Enrol: Always apply enrolment duration.

Before the fix, the startdates and duration fields were integrated to HTML code only
when the user clicked on the collapsible region to see them.
It was wrong because their values were not sent by the form
if ever the user didn't expand this Enrolment options region.

8 years agoMDL-40436 block_course_list: Fix bad context resolution
Frederic Massart [Thu, 12 Dec 2013 08:04:16 +0000 (09:04 +0100)]
MDL-40436 block_course_list: Fix bad context resolution

We were trying to get the course context of a remote course
from a completely unrelated ID. It would sometimes work if the
ID was matching the one of a local course. In other places
we are not trying to find a context for the remote course, we
simply use the $PAGE context in format_string. So the usage
of the context has been removed here too.

8 years agoMDL-36984 Assign: Add redirect after saving grades
Jason Fowler [Thu, 12 Dec 2013 06:19:26 +0000 (14:19 +0800)]
MDL-36984 Assign: Add redirect after saving grades

8 years agoMerge branch 'MDL-42625_master-failures-fix' of git://github.com/dmonllao/moodle
Marina Glancy [Thu, 12 Dec 2013 05:49:56 +0000 (16:49 +1100)]
Merge branch 'MDL-42625_master-failures-fix' of git://github.com/dmonllao/moodle

8 years agoMDL-42625 behat: Fixing failures
David Monllao [Thu, 12 Dec 2013 04:18:01 +0000 (12:18 +0800)]
MDL-42625 behat: Fixing failures

* Expanding fieldsets before setting the course format
* Ensure editors are loaded moved to expand_all_fieldsets
* Return true rather than false when JS is disabled and
  non-allowed steps should continue without throwing an
  exception.
* Submit create user form after editing it

8 years agoMerge branch 'mucupdates27' of https://github.com/skodak/moodle
Marina Glancy [Thu, 12 Dec 2013 04:39:14 +0000 (15:39 +1100)]
Merge branch 'mucupdates27' of https://github.com/skodak/moodle

8 years agoMDL-42973 fix MUC caching issue when fetching available updates
Petr Škoda [Thu, 12 Dec 2013 03:36:36 +0000 (11:36 +0800)]
MDL-42973 fix MUC caching issue when fetching available updates

8 years agoMDL-34321 Assignment2.2 - Fixing submission count
Jason Fowler [Wed, 11 Dec 2013 06:56:51 +0000 (14:56 +0800)]
MDL-34321 Assignment2.2 - Fixing submission count

8 years agoMDL-40058 mod_wiki: trigger event on page map view
Rajesh Taneja [Thu, 12 Dec 2013 01:36:24 +0000 (09:36 +0800)]
MDL-40058 mod_wiki: trigger event on page map view

8 years agoMDL-31410 paypal: fix problem on notifications
Eloy Lafuente (stronk7) [Thu, 12 Dec 2013 01:03:41 +0000 (02:03 +0100)]
MDL-31410 paypal: fix problem on notifications

This commit fixes a PHP warning about using a
unititialised variable and also the problems when
notifications are enabled and there is not yet a
teacher in the course, defaulting to admin for student
notifications and preventing teacher notifications to happen.

8 years agoMerge branch 'w50_MDL-31410_m27_paypalipn' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Thu, 12 Dec 2013 00:09:02 +0000 (01:09 +0100)]
Merge branch 'w50_MDL-31410_m27_paypalipn' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-43232-master-1' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Wed, 11 Dec 2013 20:13:42 +0000 (09:13 +1300)]
Merge branch 'MDL-43232-master-1' of git://github.com/andrewnicols/moodle

8 years agoMDL-42625 behat: Fixing ExpectationException::__construct() call
David Monllao [Wed, 11 Dec 2013 09:02:46 +0000 (17:02 +0800)]
MDL-42625 behat: Fixing ExpectationException::__construct() call

Also adding an extra checking to the selector to
ensure it is no updating the list of files.

8 years agoMDL-43232 JavaScript: Correct typo when cancelling the confirmcancel
Andrew Nicols [Wed, 11 Dec 2013 05:29:39 +0000 (13:29 +0800)]
MDL-43232 JavaScript: Correct typo when cancelling the confirmcancel

8 years agoMDL-43326 Assign: Start new attempt from previous missing sesskey
Damyon Wiese [Wed, 11 Dec 2013 03:59:15 +0000 (11:59 +0800)]
MDL-43326 Assign: Start new attempt from previous missing sesskey

8 years agoMDL-40058 mod_wiki: modified wiki_restore_page api to accept version and context
Rajesh Taneja [Tue, 3 Dec 2013 06:42:49 +0000 (14:42 +0800)]
MDL-40058 mod_wiki: modified wiki_restore_page api to accept version and context

8 years agoMDL-40058 Events: added unit test
Rajesh Taneja [Mon, 2 Dec 2013 08:50:03 +0000 (16:50 +0800)]
MDL-40058 Events: added unit test

8 years agoMDL-40058 Events: Replaced add_to_log for page comments to event
Rajesh Taneja [Mon, 2 Dec 2013 02:59:30 +0000 (10:59 +0800)]
MDL-40058 Events: Replaced add_to_log for page comments to event

8 years agoMDL-40058 mod_wiki: Replaced add_to_log for page version viewed to event
Rajesh Taneja [Fri, 29 Nov 2013 08:23:06 +0000 (16:23 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page version viewed to event

8 years agoMDL-40058 mod_wiki: Replaced add_to_log for page created to event
Rajesh Taneja [Fri, 29 Nov 2013 07:53:53 +0000 (15:53 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page created to event

8 years agoMDL-40058 mod_wiki: Replaced add_to_log for page map viewed to event
Rajesh Taneja [Fri, 29 Nov 2013 07:33:58 +0000 (15:33 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page map viewed to event

8 years agoMDL-40058 mod_wiki: Replaced add_to_log for admin to event
Rajesh Taneja [Fri, 29 Nov 2013 07:19:53 +0000 (15:19 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for admin to event

8 years agoMDL-40058 mod_wiki: Replaced add_to_log for override locks with event
Rajesh Taneja [Fri, 29 Nov 2013 06:51:42 +0000 (14:51 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for override locks with event

8 years agoMDL-40058 mod_wiki: Replaced add_to_log for page diff view with event
Rajesh Taneja [Fri, 29 Nov 2013 06:19:12 +0000 (14:19 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page diff view with event

8 years agoMDL-40058 mod_wiki: Replaced add_to_log for page edit with event
Rajesh Taneja [Fri, 29 Nov 2013 06:18:10 +0000 (14:18 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page edit with event

8 years agoMDL-40058 mod_wiki: Replaced add_to_log for version restored with event
Rajesh Taneja [Fri, 29 Nov 2013 06:16:19 +0000 (14:16 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for version restored with event

8 years agoMDL-40058 mod_wiki: Replaced add_to_log for history viewed with event
Rajesh Taneja [Fri, 29 Nov 2013 06:15:04 +0000 (14:15 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for history viewed with event

8 years agoMDL-40058 mod_wiki: Replaced add_to_log on index.php with event
Rajesh Taneja [Fri, 29 Nov 2013 06:13:14 +0000 (14:13 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log on index.php with event

8 years agoMDL-40058 mod_wiki: Replaced add_to_log for course_module_viewed with event
Rajesh Taneja [Fri, 29 Nov 2013 06:11:26 +0000 (14:11 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for course_module_viewed with event

8 years agoMDL-40058 mod_wiki: Replaced add_to_log for page_viewed with event
Rajesh Taneja [Mon, 18 Nov 2013 08:17:52 +0000 (16:17 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page_viewed with event

8 years agoMerge branch 'wip-MDL-43218-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Wed, 11 Dec 2013 02:32:29 +0000 (15:32 +1300)]
Merge branch 'wip-MDL-43218-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-43218 blog: prepare the blog navigation only when needed
Marina Glancy [Wed, 11 Dec 2013 02:27:38 +0000 (13:27 +1100)]
MDL-43218 blog: prepare the blog navigation only when needed

8 years agoMDL-43218 navigation: Remove link to blogs when they are disabled
Simon Coggins [Thu, 5 Dec 2013 07:20:38 +0000 (20:20 +1300)]
MDL-43218 navigation: Remove link to blogs when they are disabled

8 years agoMerge branch 'MDL-43071-master' of https://github.com/lucisgit/moodle
Marina Glancy [Wed, 11 Dec 2013 01:46:14 +0000 (12:46 +1100)]
Merge branch 'MDL-43071-master' of https://github.com/lucisgit/moodle

8 years agoMerge branch 'MDL-42932_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 10 Dec 2013 23:30:26 +0000 (12:30 +1300)]
Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle

8 years agoNOBUG: shifter rebuild
Sam Hemelryk [Tue, 10 Dec 2013 23:26:47 +0000 (12:26 +1300)]
NOBUG: shifter rebuild

8 years agoMerge branch 'MDL-38775-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 10 Dec 2013 23:25:16 +0000 (12:25 +1300)]
Merge branch 'MDL-38775-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38776-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 10 Dec 2013 23:25:14 +0000 (12:25 +1300)]
Merge branch 'MDL-38776-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-43202-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 10 Dec 2013 23:25:12 +0000 (12:25 +1300)]
Merge branch 'MDL-43202-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 10 Dec 2013 22:29:06 +0000 (23:29 +0100)]
Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-42815-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 10 Dec 2013 22:24:56 +0000 (23:24 +0100)]
Merge branch 'MDL-42815-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'MDL-42796-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 10 Dec 2013 22:13:32 +0000 (11:13 +1300)]
Merge branch 'MDL-42796-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-43252-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 10 Dec 2013 22:03:39 +0000 (11:03 +1300)]
Merge branch 'MDL-43252-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'wip-MDL-43279-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 10 Dec 2013 21:59:21 +0000 (10:59 +1300)]
Merge branch 'wip-MDL-43279-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'w50_MDL-31625_m27_replace' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 10 Dec 2013 21:50:07 +0000 (10:50 +1300)]
Merge branch 'w50_MDL-31625_m27_replace' of https://github.com/skodak/moodle

8 years agoMerge branch 'wip-MDL-43150-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 10 Dec 2013 21:47:15 +0000 (22:47 +0100)]
Merge branch 'wip-MDL-43150-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-42959-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 10 Dec 2013 21:34:17 +0000 (10:34 +1300)]
Merge branch 'MDL-42959-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-40517-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 10 Dec 2013 21:32:06 +0000 (10:32 +1300)]
Merge branch 'MDL-40517-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'wip-MDL-42174-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 10 Dec 2013 21:06:39 +0000 (22:06 +0100)]
Merge branch 'wip-MDL-42174-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'wip-MDL-43135' of https://github.com/jennymgray/moodle
Eloy Lafuente (stronk7) [Tue, 10 Dec 2013 18:43:33 +0000 (19:43 +0100)]
Merge branch 'wip-MDL-43135' of https://github.com/jennymgray/moodle

8 years agoMDL-43135 Lang: removed redundant opentoguests
Jenny Gray [Tue, 3 Dec 2013 09:46:03 +0000 (09:46 +0000)]
MDL-43135 Lang: removed redundant opentoguests

8 years agoMDL-43135 Guest Enrol: new language string for with key icon
Jenny Gray [Tue, 3 Dec 2013 09:45:14 +0000 (09:45 +0000)]
MDL-43135 Guest Enrol: new language string for with key icon

AMOS BEGIN
CPY [pluginname,enrol_guest], [guestaccess_withpassword,enrol_guest]
CPY [pluginname,enrol_guest], [guestaccess_withoutpassword,enrol_guest]
AMOS END

8 years agoMDL-37972 Assignment: fixing settings link for upload single submissions
Sam Chaffee [Tue, 10 Dec 2013 05:41:57 +0000 (13:41 +0800)]
MDL-37972 Assignment: fixing settings link for upload single submissions

8 years agoMerge branch 'MDL-37380-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Tue, 10 Dec 2013 04:20:22 +0000 (15:20 +1100)]
Merge branch 'MDL-37380-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-43199-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 10 Dec 2013 04:15:27 +0000 (15:15 +1100)]
Merge branch 'MDL-43199-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'm27_MDL-43082_IE9_Compat_View_SVG_Say_No' of https://github.com/scara...
Marina Glancy [Tue, 10 Dec 2013 03:47:08 +0000 (14:47 +1100)]
Merge branch 'm27_MDL-43082_IE9_Compat_View_SVG_Say_No' of https://github.com/scara/moodle

8 years agoMerge branch 'MDL-37517-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Tue, 10 Dec 2013 03:29:22 +0000 (14:29 +1100)]
Merge branch 'MDL-37517-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-43215_master' of https://github.com/markn86/moodle
Marina Glancy [Tue, 10 Dec 2013 03:25:24 +0000 (14:25 +1100)]
Merge branch 'MDL-43215_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-43131' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 10 Dec 2013 03:10:04 +0000 (14:10 +1100)]
Merge branch 'MDL-43131' of git://github.com/timhunt/moodle

8 years agoMerge branch 'mdl42487-master' of https://github.com/tlock/moodle
Marina Glancy [Tue, 10 Dec 2013 02:56:49 +0000 (13:56 +1100)]
Merge branch 'mdl42487-master' of https://github.com/tlock/moodle

8 years agoMDL-25473 mediaplayer - prevent embedded videos from looping
Jason Fowler [Tue, 10 Dec 2013 02:49:44 +0000 (10:49 +0800)]
MDL-25473 mediaplayer - prevent embedded videos from looping

8 years agoMDL-42932 core_calendar: introduced calendar type system setting
Mark Nelson [Sat, 16 Nov 2013 21:12:06 +0000 (13:12 -0800)]
MDL-42932 core_calendar: introduced calendar type system setting

8 years agoMDL-43044 fix trailing whitespace
Marina Glancy [Tue, 10 Dec 2013 00:52:42 +0000 (11:52 +1100)]
MDL-43044 fix trailing whitespace

8 years agoMerge branch 'MDL-43044-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Tue, 10 Dec 2013 00:40:54 +0000 (11:40 +1100)]
Merge branch 'MDL-43044-master' of git://github.com/ankitagarwal/moodle

8 years agoMDL-43279 block_blog_recent: fixed undefined property notice
Marina Glancy [Mon, 9 Dec 2013 22:28:05 +0000 (09:28 +1100)]
MDL-43279 block_blog_recent: fixed undefined property notice

8 years agoMerge branch 'MDL-43104-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 9 Dec 2013 21:27:45 +0000 (10:27 +1300)]
Merge branch 'MDL-43104-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-43164-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 9 Dec 2013 20:52:08 +0000 (09:52 +1300)]
Merge branch 'MDL-43164-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38774-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 9 Dec 2013 20:25:51 +0000 (09:25 +1300)]
Merge branch 'MDL-38774-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'm27_MDL-43159_Wrong_Naming_Convention_For_Variable' of https://github...
Sam Hemelryk [Mon, 9 Dec 2013 20:21:10 +0000 (09:21 +1300)]
Merge branch 'm27_MDL-43159_Wrong_Naming_Convention_For_Variable' of https://github.com/scara/moodle

8 years agoNOBUG: rebuilt shifted files
Sam Hemelryk [Mon, 9 Dec 2013 20:18:16 +0000 (09:18 +1300)]
NOBUG: rebuilt shifted files