moodle.git
10 years agoMerge branch 'MDL-46084-master' of https://github.com/sbourget/moodle
Sam Hemelryk [Mon, 29 Sep 2014 22:28:26 +0000 (11:28 +1300)]
Merge branch 'MDL-46084-master' of https://github.com/sbourget/moodle

10 years agoMerge branch 'MDL-47419-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 29 Sep 2014 21:35:47 +0000 (10:35 +1300)]
Merge branch 'MDL-47419-master' of git://github.com/ankitagarwal/moodle

10 years agoMDL-45893 user: fixed user menu for guest
Sam Hemelryk [Mon, 29 Sep 2014 21:25:23 +0000 (10:25 +1300)]
MDL-45893 user: fixed user menu for guest

10 years agoMerge branch 'm28_MDL-47170' of https://github.com/totara/moodle
Sam Hemelryk [Mon, 29 Sep 2014 21:03:06 +0000 (10:03 +1300)]
Merge branch 'm28_MDL-47170' of https://github.com/totara/moodle

10 years agoMDL-46652 output: more thorough custom menu multilang tests
Sam Hemelryk [Mon, 29 Sep 2014 20:54:08 +0000 (09:54 +1300)]
MDL-46652 output: more thorough custom menu multilang tests

10 years agoMerge branch 'MDL-46652-master' of git://github.com/jethac/moodle
Sam Hemelryk [Mon, 29 Sep 2014 20:52:54 +0000 (09:52 +1300)]
Merge branch 'MDL-46652-master' of git://github.com/jethac/moodle

10 years agoMerge branch 'MDL-47214-ClientIp-wrong-with-multiple-proxies' of https://github.com...
Sam Hemelryk [Mon, 29 Sep 2014 19:48:20 +0000 (08:48 +1300)]
Merge branch 'MDL-47214-ClientIp-wrong-with-multiple-proxies' of https://github.com/mhughes2k/moodle

10 years agoMerge branch 'MDL-46920-master' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 29 Sep 2014 15:25:41 +0000 (16:25 +0100)]
Merge branch 'MDL-46920-master' of git://github.com/jethac/moodle

10 years agoMerge branch 'MDL-47069-master-plugin-dependency' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 29 Sep 2014 11:46:11 +0000 (12:46 +0100)]
Merge branch 'MDL-47069-master-plugin-dependency' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-47163-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 29 Sep 2014 11:29:59 +0000 (12:29 +0100)]
Merge branch 'MDL-47163-master' of git://github.com/jleyva/moodle

10 years agoMerge branch 'MDL-47307-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 29 Sep 2014 11:04:01 +0000 (12:04 +0100)]
Merge branch 'MDL-47307-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-47358-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 29 Sep 2014 10:58:14 +0000 (11:58 +0100)]
Merge branch 'MDL-47358-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-47322-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 29 Sep 2014 10:12:29 +0000 (11:12 +0100)]
Merge branch 'MDL-47322-master' of https://github.com/sammarshallou/moodle

10 years agoMerge branch 'wip_MDL-47333_m28_fonts' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 29 Sep 2014 09:42:50 +0000 (10:42 +0100)]
Merge branch 'wip_MDL-47333_m28_fonts' of https://github.com/skodak/moodle

10 years agoMerge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 29 Sep 2014 09:30:42 +0000 (10:30 +0100)]
Merge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

10 years agoMerge branch 'MDL-47033_master' of https://github.com/totara/openbadges
Sam Hemelryk [Mon, 29 Sep 2014 02:18:03 +0000 (15:18 +1300)]
Merge branch 'MDL-47033_master' of https://github.com/totara/openbadges

10 years agoMerge branch 'MDL-47295-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 29 Sep 2014 02:17:24 +0000 (15:17 +1300)]
Merge branch 'MDL-47295-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'wip_MDL-47300_m28_tcpdf' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 29 Sep 2014 02:15:47 +0000 (15:15 +1300)]
Merge branch 'wip_MDL-47300_m28_tcpdf' of https://github.com/skodak/moodle

10 years agoMerge branch 'wip-MDL-47398-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:35:06 +0000 (14:35 +1300)]
Merge branch 'wip-MDL-47398-master' of git://github.com/marinaglancy/moodle

10 years agoMerge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:32:38 +0000 (14:32 +1300)]
Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle

10 years agoMerge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:23:18 +0000 (14:23 +1300)]
Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle

10 years agoMerge branch 'MDL-36929_new_discussions' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:21:39 +0000 (14:21 +1300)]
Merge branch 'MDL-36929_new_discussions' of https://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-39190' of https://github.com/pauln/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:19:52 +0000 (14:19 +1300)]
Merge branch 'MDL-39190' of https://github.com/pauln/moodle

10 years agoMerge branch 'MDL-20250_grade_settings2' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:00:42 +0000 (14:00 +1300)]
Merge branch 'MDL-20250_grade_settings2' of https://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-47411-master-submodules' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Sun, 28 Sep 2014 23:42:32 +0000 (01:42 +0200)]
Merge branch 'MDL-47411-master-submodules' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-37707-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 28 Sep 2014 22:35:23 +0000 (11:35 +1300)]
Merge branch 'MDL-37707-master' of git://github.com/FMCorz/moodle

10 years agoMerge branch 'MDL-42974-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Sun, 28 Sep 2014 22:21:19 +0000 (11:21 +1300)]
Merge branch 'MDL-42974-master' of https://github.com/sammarshallou/moodle

10 years agoMerge branch 'MDL-47378-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Sun, 28 Sep 2014 22:19:06 +0000 (11:19 +1300)]
Merge branch 'MDL-47378-master' of git://github.com/danpoltawski/moodle

10 years agoMDL-32870 mod_lesson: added support for files to question answers and responses
Jean-Michel Vedrine [Sun, 17 Mar 2013 22:40:40 +0000 (23:40 +0100)]
MDL-32870 mod_lesson: added support for files to question answers and responses

10 years agoMerge branch 'MDL-43566' of https://github.com/willylee/moodle
Sam Hemelryk [Sun, 28 Sep 2014 20:51:35 +0000 (09:51 +1300)]
Merge branch 'MDL-43566' of https://github.com/willylee/moodle

10 years agoMerge branch 'MDL-47395' of git://github.com/nebgor/moodle
Sam Hemelryk [Sun, 28 Sep 2014 20:11:25 +0000 (09:11 +1300)]
Merge branch 'MDL-47395' of git://github.com/nebgor/moodle

10 years agoMerge branch 'MDL-47381' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 28 Sep 2014 20:06:35 +0000 (09:06 +1300)]
Merge branch 'MDL-47381' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-47380-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Sun, 28 Sep 2014 20:02:52 +0000 (09:02 +1300)]
Merge branch 'MDL-47380-master' of https://github.com/sammarshallou/moodle

10 years agoMDL-47252 mod_forum: fixed whitespace
Sam Hemelryk [Sun, 28 Sep 2014 19:44:43 +0000 (08:44 +1300)]
MDL-47252 mod_forum: fixed whitespace

10 years agoMerge branch 'MDL-47252-master' of git://github.com/gurgus/moodle
Sam Hemelryk [Sun, 28 Sep 2014 19:43:51 +0000 (08:43 +1300)]
Merge branch 'MDL-47252-master' of git://github.com/gurgus/moodle

10 years agoMDL-47242 theme_bootstrapbase: Fixed whitespace (take2)
Eloy Lafuente (stronk7) [Sun, 28 Sep 2014 16:27:40 +0000 (18:27 +0200)]
MDL-47242 theme_bootstrapbase: Fixed whitespace (take2)

Seems that previous whitespace fix was not ok.

10 years agoMDL-47163 messages: Upgrade Mobile notifications to use Airnotifier v2
Juan Leyva [Mon, 15 Sep 2014 11:46:02 +0000 (13:46 +0200)]
MDL-47163 messages: Upgrade Mobile notifications to use  Airnotifier v2

10 years agoMDL-47408 user: Add enableblogs checking before adding blog's link.
Dmitry Nefedov [Sat, 27 Sep 2014 00:58:14 +0000 (08:58 +0800)]
MDL-47408 user: Add enableblogs checking before adding blog's link.

10 years agoMDL-47214 General: Multiple IP addresses in X-Forwarded-For Fixed
Michael Hughes [Thu, 11 Sep 2014 12:10:29 +0000 (13:10 +0100)]
MDL-47214 General: Multiple IP addresses in X-Forwarded-For Fixed

Fixed getremoteaddr() function handle multiple IP addresses
Addressed point 2 on Dan's list
Stopped changing $CFG value after started test.

10 years agoMDL-42974 UI: Modal dialogs do not work in IE8
sam marshall [Wed, 24 Sep 2014 11:04:48 +0000 (12:04 +0100)]
MDL-42974 UI: Modal dialogs do not work in IE8

10 years agoMDL-47380 Availability: Editing interface broken in IE8
sam marshall [Tue, 23 Sep 2014 11:09:03 +0000 (12:09 +0100)]
MDL-47380 Availability: Editing interface broken in IE8

10 years agoMDL-47322 Availability: empty availability should be saved as null
sam marshall [Thu, 18 Sep 2014 11:59:19 +0000 (12:59 +0100)]
MDL-47322 Availability: empty availability should be saved as null

As part of the unit test modifications for this change, I added the get_json
function to the availability conditions that didn't have it. (This is a function
for use in unit tests.)

10 years agoMDL-47381 qformat: Behat tests have wrong plugin type.
Tim Hunt [Tue, 23 Sep 2014 10:52:03 +0000 (11:52 +0100)]
MDL-47381 qformat: Behat tests have wrong plugin type.

10 years agoMDL-36929 mod_forum: added bolding of discussion titles on the recent activity page
Andrew Davis [Thu, 18 Sep 2014 07:59:59 +0000 (15:59 +0800)]
MDL-36929 mod_forum: added bolding of discussion titles on the recent activity page

10 years agoMDL-47295 libraries: Re-apply removal of random seed initialisation
Frederic Massart [Fri, 26 Sep 2014 02:33:39 +0000 (10:33 +0800)]
MDL-47295 libraries: Re-apply removal of random seed initialisation

See MDL-41198.

10 years agoMDL-47295 libraries: Update AdoDB to v5.19
Frederic Massart [Fri, 26 Sep 2014 02:31:39 +0000 (10:31 +0800)]
MDL-47295 libraries: Update AdoDB to v5.19

10 years agoMDL-20250 core_grade: added some settings to disable or hide gradebook functionality
Andrew Davis [Sat, 9 Aug 2014 12:28:11 +0000 (20:28 +0800)]
MDL-20250 core_grade: added some settings to disable or hide gradebook functionality

10 years agoMDL-47333 fix support for custom fonts in tcpdf
Petr Skoda [Tue, 23 Sep 2014 22:39:30 +0000 (10:39 +1200)]
MDL-47333 fix support for custom fonts in tcpdf

10 years agoMDL-47398 core_grades: fix grade category generator
Marina Glancy [Wed, 24 Sep 2014 07:40:52 +0000 (15:40 +0800)]
MDL-47398 core_grades: fix grade category generator

10 years agoMDL-47411 admin: Check if the plugin is a git submodule on uninstalling
David Mudrák [Thu, 25 Sep 2014 19:17:53 +0000 (21:17 +0200)]
MDL-47411 admin: Check if the plugin is a git submodule on uninstalling

Credit goes to PJ King. I was trying to add unit tests for this new
behaviour but it turned out there are many hard-coded dependencies and
it's not easy to make the whole machinery support alternative location
of testable (fake) plugins.

10 years agoMDL-47069 admin: Add option to upload required ZIP at the check page
David Mudrák [Tue, 2 Sep 2014 18:53:13 +0000 (20:53 +0200)]
MDL-47069 admin: Add option to upload required ZIP at the check page

The plugins check page displays other plugins that the current one
depends on.  Previously, we always displayed the other plugin as a link
to the plugins directory. This did not work well in two scenarios:

* The admin wants/needs to upload the other plugin from the ZIP file
  (e.g. it is not available in the plugins directory),

* the other plugin is actually a standard plugin that is not supposed to
  be registered with the plugins directory.

This patch displays the Install or Upload or Check for updates links
next to the required plugin instead, as appropriate.

10 years agoMDL-46084 Calendar: Fix importing of full day events from Google
Stephen Bourget [Thu, 25 Sep 2014 13:42:10 +0000 (09:42 -0400)]
MDL-46084 Calendar: Fix importing of full day events from Google

10 years agoMDL-43566 course: add delete icon to search returns in course management listings
Willy Lee [Fri, 19 Sep 2014 19:05:39 +0000 (12:05 -0700)]
MDL-43566 course: add delete icon to search returns in course management listings

10 years agoweekly release 2.8dev
Dan Poltawski [Thu, 25 Sep 2014 10:17:51 +0000 (11:17 +0100)]
weekly release 2.8dev

10 years agoNOBUG: Fixed SVG browser compatibility
Dan Poltawski [Thu, 25 Sep 2014 10:17:48 +0000 (11:17 +0100)]
NOBUG: Fixed SVG browser compatibility

10 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 25 Sep 2014 10:17:47 +0000 (11:17 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

10 years agoMDL-45893 user_menu: revised based on action_menu
Jetha Chan [Thu, 18 Sep 2014 08:30:24 +0000 (16:30 +0800)]
MDL-45893 user_menu: revised based on action_menu

10 years agoMDL-47419 development: Add atlassian-ide-plugin.xml to .gitignore
Ankit Agarwal [Thu, 25 Sep 2014 05:03:01 +0000 (10:33 +0530)]
MDL-47419 development: Add atlassian-ide-plugin.xml to .gitignore

10 years agoMDL-47307 libraries: Update Markdown to v1.4.1
Frederic Massart [Thu, 25 Sep 2014 02:53:34 +0000 (10:53 +0800)]
MDL-47307 libraries: Update Markdown to v1.4.1

10 years agoMDL-47404 filelib: Prevent flash from treating files as uploads
Dan Marsden [Wed, 24 Sep 2014 10:39:53 +0000 (22:39 +1200)]
MDL-47404 filelib: Prevent flash from treating files as uploads

Flash treats files as uploads if filename is passed in content-disposition
this causes security to be enforced that causes issues with SCORM packages

10 years agoMDL-47242: Fixed whitespace
Sam Hemelryk [Thu, 25 Sep 2014 00:19:13 +0000 (12:19 +1200)]
MDL-47242: Fixed whitespace

10 years agoMDL-47300 import latest TCPDF 6.0.093
Petr Skoda [Wed, 24 Sep 2014 21:39:58 +0000 (09:39 +1200)]
MDL-47300 import latest TCPDF 6.0.093

10 years agoMDL-47378 mod_assign: prevent debugging notice
Dan Poltawski [Wed, 24 Sep 2014 14:41:04 +0000 (15:41 +0100)]
MDL-47378 mod_assign: prevent debugging notice

Parameters come out of get_user_preferences as strings.

10 years agoMDL-47395 added cli_error() visual cue
Aparup Banerjee [Wed, 24 Sep 2014 06:30:24 +0000 (14:30 +0800)]
MDL-47395 added cli_error() visual cue

10 years agoMDL-37707 mod_assign: Prevent user from switching to and from team submissions
Pavel Sokolov [Wed, 24 Sep 2014 07:51:03 +0000 (11:51 +0400)]
MDL-37707 mod_assign: Prevent user from switching to and from team submissions

10 years agoMDL-47242 theme_bootstrapbase: inverted color and RTL fixes
Jetha Chan [Wed, 24 Sep 2014 07:53:42 +0000 (15:53 +0800)]
MDL-47242 theme_bootstrapbase: inverted color and RTL fixes

10 years agoMDL-47358 gradereport_history: Improved default natural sorting by time
Frederic Massart [Mon, 22 Sep 2014 08:27:16 +0000 (16:27 +0800)]
MDL-47358 gradereport_history: Improved default natural sorting by time

10 years agoMerge branch 'MDL-47248-master-rsssitelogo' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 23 Sep 2014 23:37:22 +0000 (01:37 +0200)]
Merge branch 'MDL-47248-master-rsssitelogo' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'MDL-47224' of git://github.com/aolley/moodle
Eloy Lafuente (stronk7) [Tue, 23 Sep 2014 23:26:52 +0000 (01:26 +0200)]
Merge branch 'MDL-47224' of git://github.com/aolley/moodle

10 years agoMDL-45336 lesson: copied used strings from quiz
Marina Glancy [Wed, 30 Apr 2014 06:30:51 +0000 (14:30 +0800)]
MDL-45336 lesson: copied used strings from quiz

AMOS BEGIN
 CPY [false,mod_quiz],[false,mod_lesson]
 CPY [fractionsaddwrong,mod_quiz],[fractionsaddwrong,mod_lesson]
 CPY [fractionsnomax,mod_quiz],[fractionsnomax,mod_lesson]
 CPY [notenoughsubquestions,mod_quiz],[notenoughsubquestions,mod_lesson]
 CPY [true,mod_quiz],[true,mod_lesson]
AMOS END

10 years agoMDL-45336 questionbank: use core strings instead of quiz
Marina Glancy [Wed, 30 Apr 2014 06:53:12 +0000 (14:53 +0800)]
MDL-45336 questionbank: use core strings instead of quiz

AMOS BEGIN
 CPY [categories,mod_quiz],[categories,question]
 CPY [unusedcategorydeleted,mod_quiz],[unusedcategorydeleted,question]
 CPY [export,mod_quiz],[export,core_question]
 CPY [import,mod_quiz],[import,core_question]
AMOS END

10 years agoMDL-45336 qtype_numerical: use own strings instead of mod_quiz
Marina Glancy [Thu, 18 Sep 2014 06:35:03 +0000 (14:35 +0800)]
MDL-45336 qtype_numerical: use own strings instead of mod_quiz

These strings have already been copied from mod_quiz to qtype_numerical but
in the qtype_numerical plugin code the translations from mod_quiz were used.
Even though the strings were already present we copy the translations.

AMOS BEGIN
 CPY [invalidnumericanswer,mod_quiz],[invalidnumericanswer,qtype_numerical]
 CPY [multiplier,mod_quiz],[qtype_numerical]
 CPY [invalidnumerictolerance,mod_quiz],[qtype_numerical]
AMOS END

10 years agoMDL-45336 question: moved used string from quiz plugin
Marina Glancy [Wed, 30 Apr 2014 06:35:18 +0000 (14:35 +0800)]
MDL-45336 question: moved used string from quiz plugin

AMOS BEGIN
 MOV [erroritemappearsmorethanoncewithdifferentweight,quiz_statistics],[erroritemappearsmorethanoncewithdifferentweight,question]
AMOS END

10 years agoMDL-45336 scorm: copied used string from quiz
Marina Glancy [Wed, 30 Apr 2014 06:33:43 +0000 (14:33 +0800)]
MDL-45336 scorm: copied used string from quiz

AMOS BEGIN
 CPY [deleteselected,quiz_overview],[deleteselected,mod_scorm]
AMOS END

10 years agoMDL-45336 choice: removed unused code
Marina Glancy [Wed, 30 Apr 2014 06:31:51 +0000 (14:31 +0800)]
MDL-45336 choice: removed unused code

function prepare_choice_show_results() is never called with the 5th argument,
forming of html has been moved to the renderer in MDL-20508, when function
choice_show_results() was transformed into prepare_choice_show_results() but
not all code was deleted from the funciton.

10 years agoMDL-45336 backup: moved the string from quiz to core
Marina Glancy [Wed, 30 Apr 2014 06:28:59 +0000 (14:28 +0800)]
MDL-45336 backup: moved the string from quiz to core

AMOS BEGIN
 CPY [timetaken,mod_quiz],[timetaken,backup]
AMOS END

10 years agoMDL-47180 qformat_webct: whitespace cleanup
Eloy Lafuente (stronk7) [Tue, 23 Sep 2014 22:56:40 +0000 (00:56 +0200)]
MDL-47180 qformat_webct: whitespace cleanup

10 years agoMerge branch 'MDL-47180' of git://github.com/jmvedrine/moodle
Eloy Lafuente (stronk7) [Tue, 23 Sep 2014 22:40:40 +0000 (00:40 +0200)]
Merge branch 'MDL-47180' of git://github.com/jmvedrine/moodle

10 years agoAutomatically generated installer lang files
AMOS bot [Tue, 23 Sep 2014 16:05:53 +0000 (00:05 +0800)]
Automatically generated installer lang files

10 years agoMDL-47180 qformat_webct: Import of calculated questions broken
Jean-Michel Vedrine [Tue, 9 Sep 2014 15:06:22 +0000 (17:06 +0200)]
MDL-47180 qformat_webct: Import of calculated questions broken

10 years agoMerge branch 'MDL-47240-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 23 Sep 2014 09:57:00 +0000 (10:57 +0100)]
Merge branch 'MDL-47240-master' of https://github.com/sammarshallou/moodle

10 years agoMDL-39190 Javascript: Pop-up calendar days of week wrong
Paul Nicholls [Mon, 22 Sep 2014 22:51:15 +0000 (10:51 +1200)]
MDL-39190 Javascript: Pop-up calendar days of week wrong

The YUI2 calendar widget (still used via 2in3) uses midnight as the time
component of its Date objects, which triggers a Safari bug resulting in
11pm Saturday being returned instead of midnight Sunday when subtracting
days to get the last few days of the previous month.  This shows up ONLY
on the month after DST begins, if DST begins on the last Sunday of a given
month (and the Calendar widget is set to Sunday as the first day of the
week).  The fix/workaround of using noon instead of midnight is employed
by YUI3 and others.

10 years agoMerge branch 'MDL-46811-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 23 Sep 2014 04:36:05 +0000 (16:36 +1200)]
Merge branch 'MDL-46811-master' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'MDL-47244-master' of git://github.com/jethac/moodle
Sam Hemelryk [Tue, 23 Sep 2014 04:32:09 +0000 (16:32 +1200)]
Merge branch 'MDL-47244-master' of git://github.com/jethac/moodle

Conflicts:
theme/bootstrapbase/less/moodle/responsive.less
theme/bootstrapbase/style/moodle.css

10 years agoMerge branch 'wip-MDL-46937-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 23 Sep 2014 03:26:06 +0000 (15:26 +1200)]
Merge branch 'wip-MDL-46937-master' of git://github.com/marinaglancy/moodle

10 years agoMDL-47252 mod_forum: Ensure guest users can't subscribe to discussions
Dave Cooper [Tue, 16 Sep 2014 09:19:54 +0000 (17:19 +0800)]
MDL-47252 mod_forum: Ensure guest users can't subscribe to discussions

10 years agoMerge branch 'MDL-47242-master' of git://github.com/jethac/moodle
Sam Hemelryk [Tue, 23 Sep 2014 00:23:08 +0000 (12:23 +1200)]
Merge branch 'MDL-47242-master' of git://github.com/jethac/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

10 years agoMerge branch 'MDL-47182-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 22 Sep 2014 23:52:10 +0000 (01:52 +0200)]
Merge branch 'MDL-47182-master' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'MDL-46313-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 22 Sep 2014 23:48:21 +0000 (01:48 +0200)]
Merge branch 'MDL-46313-master' of git://github.com/andrewnicols/moodle

10 years agoMerge branch 'MDL-46523-master' of git://github.com/jethac/moodle
Eloy Lafuente (stronk7) [Mon, 22 Sep 2014 23:40:50 +0000 (01:40 +0200)]
Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle

10 years agoMerge branch 'MDL-47269_master' of https://github.com/nadavkav/moodle
Eloy Lafuente (stronk7) [Mon, 22 Sep 2014 23:28:29 +0000 (01:28 +0200)]
Merge branch 'MDL-47269_master' of https://github.com/nadavkav/moodle

10 years agoMerge branch 'MDL-47266' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 22 Sep 2014 23:12:16 +0000 (01:12 +0200)]
Merge branch 'MDL-47266' of git://github.com/timhunt/moodle

10 years agoMDL-37998 quiz settings: disableif rules should account for overrides.
Tim Hunt [Sun, 14 Sep 2014 13:14:11 +0000 (14:14 +0100)]
MDL-37998 quiz settings: disableif rules should account for overrides.

Some form fields are disabled if only one attempt is allowed. However,
there may be an override allowing some students more attempts. We need
to account for that possiblity when setting up the disabled if rules.

Note the disabledIf is good for usability on this complex form, which is
why I don't just want to get rid of them.

10 years agoMerge branch 'MDL-47238_guest' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 22 Sep 2014 15:13:20 +0000 (16:13 +0100)]
Merge branch 'MDL-47238_guest' of https://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-47276' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 22 Sep 2014 15:08:19 +0000 (16:08 +0100)]
Merge branch 'MDL-47276' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-47270-core-component-classmap-ordering' of https://github.com/mpetr...
Dan Poltawski [Mon, 22 Sep 2014 15:03:50 +0000 (16:03 +0100)]
Merge branch 'MDL-47270-core-component-classmap-ordering' of https://github.com/mpetrowi/moodle

10 years agoMerge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 22 Sep 2014 14:02:51 +0000 (15:02 +0100)]
Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle

10 years agoMerge branch 'MDL-40006' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 22 Sep 2014 10:55:47 +0000 (11:55 +0100)]
Merge branch 'MDL-40006' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-10971_cloze_shuffle_fix' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 22 Sep 2014 10:39:42 +0000 (11:39 +0100)]
Merge branch 'MDL-10971_cloze_shuffle_fix' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-46991-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 22 Sep 2014 09:57:20 +0000 (10:57 +0100)]
Merge branch 'MDL-46991-master' of https://github.com/sammarshallou/moodle