moodle.git
7 years agoMerge branch '38343-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 24 Nov 2014 23:26:41 +0000 (00:26 +0100)]
Merge branch '38343-29' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '48304-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 24 Nov 2014 23:23:42 +0000 (00:23 +0100)]
Merge branch '48304-29' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-48197-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 24 Nov 2014 22:02:19 +0000 (11:02 +1300)]
Merge branch 'MDL-48197-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-48246-M29' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 24 Nov 2014 21:52:42 +0000 (10:52 +1300)]
Merge branch 'MDL-48246-M29' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-48259' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 24 Nov 2014 21:49:54 +0000 (10:49 +1300)]
Merge branch 'MDL-48259' of git://github.com/timhunt/moodle

7 years agoMerge branch 'm29_MDL-48265' of https://github.com/totara/moodle
Sam Hemelryk [Mon, 24 Nov 2014 20:42:46 +0000 (09:42 +1300)]
Merge branch 'm29_MDL-48265' of https://github.com/totara/moodle

7 years agoMerge branch 'wip_MDL-48282_m29_firstaccess' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Nov 2014 20:39:33 +0000 (09:39 +1300)]
Merge branch 'wip_MDL-48282_m29_firstaccess' of https://github.com/skodak/moodle

7 years agoMDL-20365 auth_db: post integration tweaks
Sam Hemelryk [Mon, 24 Nov 2014 20:05:20 +0000 (09:05 +1300)]
MDL-20365 auth_db: post integration tweaks

* Fixes SQL indentation.
* Amended the new auth_dbsaltedcrypt string.

7 years agoMerge branch 'MDL-20365_auth_db_salted_passwords' of https://github.com/MorrisR2...
Sam Hemelryk [Mon, 24 Nov 2014 19:19:04 +0000 (08:19 +1300)]
Merge branch 'MDL-20365_auth_db_salted_passwords' of https://github.com/MorrisR2/moodle

7 years agoMerge branch '47832-29-removed' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 24 Nov 2014 17:29:33 +0000 (17:29 +0000)]
Merge branch '47832-29-removed' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL9443_Filter_XHTML_files.2014-11-19' of git://github.com/Dave-B/moodle
Dan Poltawski [Mon, 24 Nov 2014 17:26:30 +0000 (17:26 +0000)]
Merge branch 'MDL9443_Filter_XHTML_files.2014-11-19' of git://github.com/Dave-B/moodle

7 years agoMerge branch 'MDL-45867-master' of https://github.com/dthies/moodle
Dan Poltawski [Mon, 24 Nov 2014 17:11:14 +0000 (17:11 +0000)]
Merge branch 'MDL-45867-master' of https://github.com/dthies/moodle

7 years agoMerge branch 'MDL-47601_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 24 Nov 2014 17:02:09 +0000 (17:02 +0000)]
Merge branch 'MDL-47601_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'wip-MDL-48252-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 24 Nov 2014 16:29:25 +0000 (16:29 +0000)]
Merge branch 'wip-MDL-48252-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-48274-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 24 Nov 2014 15:37:56 +0000 (15:37 +0000)]
Merge branch 'MDL-48274-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'wip-mdl-48063' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 24 Nov 2014 12:03:14 +0000 (12:03 +0000)]
Merge branch 'wip-mdl-48063' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'wip-mdl-48302' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 24 Nov 2014 11:56:56 +0000 (11:56 +0000)]
Merge branch 'wip-mdl-48302' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-48180-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 24 Nov 2014 11:53:53 +0000 (11:53 +0000)]
Merge branch 'MDL-48180-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'wip_MDL-47834_m29_concurrentlogins' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 24 Nov 2014 11:07:20 +0000 (11:07 +0000)]
Merge branch 'wip_MDL-47834_m29_concurrentlogins' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-31500_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 24 Nov 2014 10:55:27 +0000 (10:55 +0000)]
Merge branch 'MDL-31500_master' of git://github.com/dmonllao/moodle

Conflicts:
backup/util/ui/renderer.php

7 years agoMerge branch 'MDL-48148-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 24 Nov 2014 02:57:59 +0000 (15:57 +1300)]
Merge branch 'MDL-48148-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-25763_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 24 Nov 2014 02:53:56 +0000 (15:53 +1300)]
Merge branch 'MDL-25763_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-48064-master' of https://github.com/dthies/moodle
Sam Hemelryk [Mon, 24 Nov 2014 01:54:16 +0000 (14:54 +1300)]
Merge branch 'MDL-48064-master' of https://github.com/dthies/moodle

7 years agoMDL-25763 tool_replace: Returning correct error code
David Monllao [Fri, 21 Nov 2014 02:40:06 +0000 (10:40 +0800)]
MDL-25763 tool_replace: Returning correct error code

7 years agoMDL-48148 mod_forum: Use the standard forum reply subject as default
Andrew Nicols [Mon, 10 Nov 2014 06:12:52 +0000 (14:12 +0800)]
MDL-48148 mod_forum: Use the standard forum reply subject as default

When a user replies by e-mail, the course name has been included in the
original e-mail. As a result, the reply subject becomes longer and longer.

In cases whether either:
* the discussion name; or
* the replied-to-post subject

is present in the mail subject, the standard reply subject is instead used.

7 years agoMerge branch 'MDL-35494_master' of https://github.com/markn86/moodle
Sam Hemelryk [Sun, 23 Nov 2014 21:06:00 +0000 (10:06 +1300)]
Merge branch 'MDL-35494_master' of https://github.com/markn86/moodle

7 years agoMDL-31500 backup: Allow front page backup/restore
David Monllao [Thu, 13 Nov 2014 02:45:15 +0000 (10:45 +0800)]
MDL-31500 backup: Allow front page backup/restore

Removes restore on front page restrictions and allows
front page modules duplication.

7 years agoMDL-31500 backup: New unit test for front page backup/restore
David Monllao [Thu, 13 Nov 2014 07:22:34 +0000 (15:22 +0800)]
MDL-31500 backup: New unit test for front page backup/restore

7 years agoMDL-48063 behat: Fixed JS Exception
Rajesh Taneja [Wed, 5 Nov 2014 06:04:13 +0000 (14:04 +0800)]
MDL-48063 behat: Fixed JS Exception

M is not created on all pages, like cron and
Steps which check for exported data. So we need
to ensure M is defined, before using it in
behat_hooks::wait_for_pending_js()

7 years agoMDL-48288 gradebook: fix floating footer exception when averages disabled
Jetha Chan [Wed, 19 Nov 2014 07:08:02 +0000 (15:08 +0800)]
MDL-48288 gradebook: fix floating footer exception when averages disabled

The code we use to update styles on floating elements did not account for
situations where those floating elements don't exist. This was discovered
when a test site didn't have column averages enabled, resulting in no
floating footer element being created, so when _handleScrollEvent was
fired the first time, a null reference exception was thrown trying to
apply styles to a non-existent element.

7 years agoMDL-48302 behat: Reverted temp fix added by MDL-48251
Rajesh Taneja [Fri, 21 Nov 2014 02:39:42 +0000 (10:39 +0800)]
MDL-48302 behat: Reverted temp fix added by MDL-48251

7 years agoMDL-25763 tool_replace: cli version
Jonathon Fowler [Wed, 8 Oct 2014 22:54:38 +0000 (08:54 +1000)]
MDL-25763 tool_replace: cli version

7 years agoMDL-48302 behat: Reset all data, before starting behat suite
Rajesh Taneja [Thu, 20 Nov 2014 07:42:32 +0000 (15:42 +0800)]
MDL-48302 behat: Reset all data, before starting behat suite

7 years agoMDL-48302 behat: Make sure to clear php file cache
Rajesh Taneja [Thu, 20 Nov 2014 07:39:39 +0000 (15:39 +0800)]
MDL-48302 behat: Make sure to clear php file cache

7 years agoMDL-48302 behat: Reset cache before scenario
Rajesh Taneja [Thu, 20 Nov 2014 07:37:10 +0000 (15:37 +0800)]
MDL-48302 behat: Reset cache before scenario

7 years agoMDL-47834 auth: Allow enforcing of login limits
Petr Skoda [Thu, 23 Oct 2014 02:33:53 +0000 (15:33 +1300)]
MDL-47834 auth: Allow enforcing of login limits

7 years agoMDL-48282 Standardise update of user->firstaccess
Petr Skoda [Wed, 19 Nov 2014 01:16:41 +0000 (14:16 +1300)]
MDL-48282 Standardise update of user->firstaccess

7 years agoweekly release 2.9dev
Dan Poltawski [Thu, 20 Nov 2014 08:38:12 +0000 (08:38 +0000)]
weekly release 2.9dev

7 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 20 Nov 2014 08:38:09 +0000 (08:38 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

7 years agoRevert "MDL-46531 Make atto foreground colors and background colors configurable"
Dan Poltawski [Thu, 20 Nov 2014 07:03:48 +0000 (07:03 +0000)]
Revert "MDL-46531 Make atto foreground colors and background colors configurable"

This reverts commit cb6e1d527093bb955946498850ef8a51276a13a4.

This reverts commit 7a5e6054248ef18f05a228ab0db4d05e5d782180, reversing
changes made to 7b9fb265d20e53580a64dcd2be8546ff5b49bd26.

This reverts commit 06404b01180a2965804fab9e47715fdc2b6bdfb4, reversing
changes made to 0f87473fed2da15a8ba72ac9a578734fe2548f10.

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoNOBUG: fixed commit message typo
Sam Hemelryk [Thu, 20 Nov 2014 03:47:33 +0000 (16:47 +1300)]
NOBUG: fixed commit message typo

7 years agoMDL-46531 editor_atto: fontcolor -> backcolor
Andrew Nicols [Thu, 20 Nov 2014 02:46:04 +0000 (10:46 +0800)]
MDL-46531 editor_atto: fontcolor -> backcolor

7 years agoMDL-48304 moodle_url: compare now considers anchor
Sam Hemelryk [Thu, 20 Nov 2014 02:38:34 +0000 (15:38 +1300)]
MDL-48304 moodle_url: compare now considers anchor

7 years agoMDL-48252 scheduled tasks: Unit test for file_temp_cleanup_task.
Adrian Greeve [Tue, 18 Nov 2014 05:58:33 +0000 (13:58 +0800)]
MDL-48252 scheduled tasks: Unit test for file_temp_cleanup_task.

7 years agoMDL-47832 cache: removed data source aggregate functionality
Sam Hemelryk [Wed, 19 Nov 2014 22:02:52 +0000 (11:02 +1300)]
MDL-47832 cache: removed data source aggregate functionality

Cache data source aggregate functionality was found to be broken
and unused, because of this the decision was made to remove it
rather than fix it.
As it was broken we did not follow typical deprecation methods and
instead the code was removed outright with only structure
remaining and left deprecated.

7 years agoMDL-43628 mod_assign: fixed formatting of statement
Sam Hemelryk [Wed, 19 Nov 2014 21:18:09 +0000 (10:18 +1300)]
MDL-43628 mod_assign: fixed formatting of statement

7 years agoMerge branch '48206-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Wed, 19 Nov 2014 20:18:37 +0000 (21:18 +0100)]
Merge branch '48206-29' of git://github.com/samhemelryk/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-46531-fixes' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Wed, 19 Nov 2014 20:12:14 +0000 (09:12 +1300)]
Merge branch 'MDL-46531-fixes' of git://github.com/andrewnicols/moodle

7 years agoMDL-48251 behat: Shuffling activity creation fix quiz behat
Rajesh Taneja [Wed, 19 Nov 2014 08:23:58 +0000 (16:23 +0800)]
MDL-48251 behat: Shuffling activity creation fix quiz behat

7 years agoMDL-9443 core_files: Also filter .xhtml resources.
David Balch [Wed, 19 Nov 2014 14:14:50 +0000 (14:14 +0000)]
MDL-9443 core_files: Also filter .xhtml resources.

Change the filters to treat .xhtml files the same as .html,
so they are filtered by both "All files" and "HTML files only".

7 years agoMDL-29585 wiki: fix unit test fails
Dan Poltawski [Wed, 19 Nov 2014 11:37:35 +0000 (11:37 +0000)]
MDL-29585 wiki: fix unit test fails

7 years agoMerge branch 'MDL-29585-master-fixup' of https://github.com/FMCorz/moodle
Dan Poltawski [Wed, 19 Nov 2014 10:29:10 +0000 (10:29 +0000)]
Merge branch 'MDL-29585-master-fixup' of https://github.com/FMCorz/moodle

7 years agoMDL-29585 mod_wiki: Prevent broken links in editable sections
Frederic Massart [Wed, 19 Nov 2014 09:24:38 +0000 (17:24 +0800)]
MDL-29585 mod_wiki: Prevent broken links in editable sections

When a section name ended with a URL, the '<a' part of [edit] link
that is appended to the section was considered as part of the URL
in the section, thus causing the [edit] link to be broken.

7 years agoMDL-46531 editor_atto: Handle a null selection better on colour change
Andrew Nicols [Wed, 19 Nov 2014 06:42:02 +0000 (14:42 +0800)]
MDL-46531 editor_atto: Handle a null selection better on colour change

Sadly, there is no easy way to do this. When a range is empty, we need to
create a new span, make the changes there, and then select it. Rangy does
not provide a helper to do this yet (will be in 1.3) so we have to do it
manually in the mean time.

7 years agoMerge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 19 Nov 2014 06:39:35 +0000 (06:39 +0000)]
Merge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-48274 mod_forum: Add missing context to has_capability call
Mario Wehr [Wed, 19 Nov 2014 06:00:23 +0000 (14:00 +0800)]
MDL-48274 mod_forum: Add missing context to has_capability call

7 years agoMDL-46865 report_log: Fixed site name in behat step
Rajesh Taneja [Wed, 19 Nov 2014 02:17:32 +0000 (10:17 +0800)]
MDL-46865 report_log: Fixed site name in behat step

7 years agoMDL-48197 testing: Normalise uses of noemailever and phpmailer sink
Andrew Nicols [Wed, 12 Nov 2014 07:51:18 +0000 (15:51 +0800)]
MDL-48197 testing: Normalise uses of noemailever and phpmailer sink

7 years agoMDL-48197 testing: Always set up a mail sink for mail redirection
Andrew Nicols [Wed, 12 Nov 2014 07:47:32 +0000 (15:47 +0800)]
MDL-48197 testing: Always set up a mail sink for mail redirection

Rather than setting noemailever in the bootstrap, this sets up a default
phpmailer message sink which will catch all messages.

Tests which require the phpmailer sink will continue to work as before
without change, though the noemailever config setting no longer needs to
be altered.

For tests wanting to test with noemailever set with the previous behaviour,
they will need to load the message sink and then close it.

7 years agoMDL-33606 event: moved upgrade notice
Sam Hemelryk [Tue, 18 Nov 2014 20:38:55 +0000 (09:38 +1300)]
MDL-33606 event: moved upgrade notice

7 years agoMerge branch 'MDL-33606_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Tue, 18 Nov 2014 20:37:19 +0000 (09:37 +1300)]
Merge branch 'MDL-33606_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-47587' of git://github.com/jmvedrine/moodle
Sam Hemelryk [Tue, 18 Nov 2014 20:18:36 +0000 (09:18 +1300)]
Merge branch 'MDL-47587' of git://github.com/jmvedrine/moodle

7 years agoMDL-45867 atto_equation: Change preview update to asynchronous
Daniel Thies [Tue, 18 Nov 2014 19:26:13 +0000 (13:26 -0600)]
MDL-45867 atto_equation: Change preview update to asynchronous

7 years agoMDL-47915 theme: use id='page-content' rather than 'content'.
Mary Evans [Tue, 28 Oct 2014 18:30:54 +0000 (18:30 +0000)]
MDL-47915 theme: use id='page-content' rather than 'content'.

Also added JS fallback for themes using copied layouts in scorm

7 years agoMDL-47501 gradebook: Add an indication that the grade letters was overridden
Gilles-Philippe Leblanc [Fri, 3 Oct 2014 15:09:46 +0000 (11:09 -0400)]
MDL-47501 gradebook: Add an indication that the grade letters was overridden

7 years agoMDL-47800 admin: improved strings
Helen Foster [Tue, 18 Nov 2014 16:30:40 +0000 (16:30 +0000)]
MDL-47800 admin: improved strings

7 years agoMerge branch 'wip_MDL-47800_m28_pwchange2' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 18 Nov 2014 16:32:57 +0000 (16:32 +0000)]
Merge branch 'wip_MDL-47800_m28_pwchange2' of git://github.com/skodak/moodle

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 18 Nov 2014 16:05:38 +0000 (00:05 +0800)]
Automatically generated installer lang files

7 years agoMerge branch 'MDL36874_Text_navigation_for_Books' of git://github.com/Dave-B/moodle
Dan Poltawski [Tue, 18 Nov 2014 13:54:05 +0000 (13:54 +0000)]
Merge branch 'MDL36874_Text_navigation_for_Books' of git://github.com/Dave-B/moodle

Conflicts:
mod/book/version.php
mod/book/db/upgrade.php

7 years agoMerge branch '47434-29-1' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 18 Nov 2014 13:22:41 +0000 (13:22 +0000)]
Merge branch '47434-29-1' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'm28_MDL-48041' of https://github.com/totara/moodle
Dan Poltawski [Tue, 18 Nov 2014 13:10:57 +0000 (13:10 +0000)]
Merge branch 'm28_MDL-48041' of https://github.com/totara/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-48146' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 18 Nov 2014 12:04:48 +0000 (12:04 +0000)]
Merge branch 'MDL-48146' of git://github.com/timhunt/moodle

7 years agoMerge branch 'wip_MDL-47803_m28_usersessions2' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 18 Nov 2014 10:15:06 +0000 (10:15 +0000)]
Merge branch 'wip_MDL-47803_m28_usersessions2' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-47700-master' of git://github.com/xow/moodle
Dan Poltawski [Tue, 18 Nov 2014 10:04:33 +0000 (10:04 +0000)]
Merge branch 'MDL-47700-master' of git://github.com/xow/moodle

7 years agoMDL-47587 Lesson: Display progress bar on the end of lesson page
Jean-Michel Vedrine [Tue, 21 Oct 2014 16:30:37 +0000 (18:30 +0200)]
MDL-47587 Lesson: Display progress bar on the end of lesson page

7 years agoMDL-48252 scheduled tasks: file_temp_cleanup_task does full delete.
Adrian Greeve [Tue, 18 Nov 2014 05:56:11 +0000 (13:56 +0800)]
MDL-48252 scheduled tasks: file_temp_cleanup_task does full delete.

This scheduled task was previously only doing a partial delete
due to the fact that the directory modification time would be
updated when a child file was deleted. It would then have to
wait another week before that directory could be deleted.

7 years agoMerge branch 'wip-mdl-48250' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 18 Nov 2014 04:37:57 +0000 (17:37 +1300)]
Merge branch 'wip-mdl-48250' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-48265 feedback: Added alt text to ghostscript test image
Brian Barnes [Tue, 18 Nov 2014 04:09:05 +0000 (17:09 +1300)]
MDL-48265 feedback: Added alt text to ghostscript test image

7 years agoMerge branch 'wip-MDL-43205-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Tue, 18 Nov 2014 03:48:27 +0000 (16:48 +1300)]
Merge branch 'wip-MDL-43205-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-29585-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 18 Nov 2014 03:47:24 +0000 (16:47 +1300)]
Merge branch 'MDL-29585-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch '48070-29' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 18 Nov 2014 02:41:28 +0000 (03:41 +0100)]
Merge branch '48070-29' of git://github.com/samhemelryk/moodle

7 years agoMDL-47803 Add report that lists user sessions
Petr Skoda [Mon, 17 Nov 2014 20:48:17 +0000 (09:48 +1300)]
MDL-47803 Add report that lists user sessions

7 years agoMerge branch 'MDL-47527_master' of https://github.com/StudiUM/moodle
Sam Hemelryk [Tue, 18 Nov 2014 00:34:29 +0000 (13:34 +1300)]
Merge branch 'MDL-47527_master' of https://github.com/StudiUM/moodle

7 years agoMDL-38343 cache: better test server strings
Sam Hemelryk [Fri, 14 Nov 2014 00:18:07 +0000 (13:18 +1300)]
MDL-38343 cache: better test server strings

7 years agoMerge branch 'MDL-47618' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 17 Nov 2014 22:12:28 +0000 (11:12 +1300)]
Merge branch 'MDL-47618' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-47777_master' of https://github.com/Syxton/moodle
Sam Hemelryk [Mon, 17 Nov 2014 21:57:29 +0000 (10:57 +1300)]
Merge branch 'MDL-47777_master' of https://github.com/Syxton/moodle

7 years agoMerge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 17 Nov 2014 21:48:31 +0000 (10:48 +1300)]
Merge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-48070 navbar: ensure navigation initialised
Sam Hemelryk [Mon, 17 Nov 2014 20:55:36 +0000 (09:55 +1300)]
MDL-48070 navbar: ensure navigation initialised

7 years agoMDL-47800 auth: Add option to logout on pw change
Petr Skoda [Wed, 22 Oct 2014 01:11:11 +0000 (14:11 +1300)]
MDL-47800 auth: Add option to logout on pw change

7 years agoMDL-48064 atto_editor: Expand event subscription for saving selection
Daniel Thies [Mon, 17 Nov 2014 17:15:45 +0000 (11:15 -0600)]
MDL-48064 atto_editor: Expand event subscription for saving selection

7 years agoMerge branch 'MDL-30619_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 17 Nov 2014 16:48:27 +0000 (16:48 +0000)]
Merge branch 'MDL-30619_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'MDL-48199-master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 17 Nov 2014 16:42:34 +0000 (16:42 +0000)]
Merge branch 'MDL-48199-master' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch '48070-29' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 17 Nov 2014 16:22:26 +0000 (16:22 +0000)]
Merge branch '48070-29' of git://github.com/samhemelryk/moodle

7 years agoMDL-48259 questionlib.php: remove functions deprecated in Moodle 2.6
Tim Hunt [Mon, 17 Nov 2014 15:06:53 +0000 (15:06 +0000)]
MDL-48259 questionlib.php: remove functions deprecated in Moodle 2.6

7 years agoMerge branch 'MDL-47648' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 17 Nov 2014 15:39:48 +0000 (15:39 +0000)]
Merge branch 'MDL-47648' of git://github.com/timhunt/moodle

7 years agoMerge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 17 Nov 2014 15:33:45 +0000 (15:33 +0000)]
Merge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'm29_MDL-48023_Theme_Setting_Files_Cacheable_By_Both_Browsers_And_Proxie...
Dan Poltawski [Mon, 17 Nov 2014 15:20:17 +0000 (15:20 +0000)]
Merge branch 'm29_MDL-48023_Theme_Setting_Files_Cacheable_By_Both_Browsers_And_Proxies' of https://github.com/scara/moodle

7 years agoMDL-48259 questionlib.php: remove functions deprecated in Moodle 2.1
Tim Hunt [Mon, 17 Nov 2014 15:06:53 +0000 (15:06 +0000)]
MDL-48259 questionlib.php: remove functions deprecated in Moodle 2.1

7 years agoMerge branch 'MDL-48042_wip' of git://github.com/ppichet/moodle
Dan Poltawski [Mon, 17 Nov 2014 15:12:56 +0000 (15:12 +0000)]
Merge branch 'MDL-48042_wip' of git://github.com/ppichet/moodle

7 years agoMDL-48246 theme: Fixed typo in 'hidepanelicon'
Mary Evans [Mon, 17 Nov 2014 14:58:37 +0000 (14:58 +0000)]
MDL-48246 theme: Fixed typo in 'hidepanelicon'