moodle.git
8 years agoMerge branch 'MDL-38011' of git://github.com/srynot4sale/moodle
Dan Poltawski [Mon, 15 Apr 2013 06:58:53 +0000 (07:58 +0100)]
Merge branch 'MDL-38011' of git://github.com/srynot4sale/moodle

8 years agoMerge branch 'MDL-38716-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 15 Apr 2013 06:35:14 +0000 (07:35 +0100)]
Merge branch 'MDL-38716-master-int' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-39068' of git://github.com/stronk7/moodle
Damyon Wiese [Mon, 15 Apr 2013 06:24:52 +0000 (14:24 +0800)]
Merge branch 'MDL-39068' of git://github.com/stronk7/moodle

8 years agoMDL-37762 navbar - fold some long lines in previous patch
Damyon Wiese [Mon, 15 Apr 2013 05:32:07 +0000 (13:32 +0800)]
MDL-37762 navbar - fold some long lines in previous patch

8 years agoMerge branch 'wip-MDL-37762-m25' of https://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 15 Apr 2013 05:30:28 +0000 (13:30 +0800)]
Merge branch 'wip-MDL-37762-m25' of https://github.com/samhemelryk/moodle

8 years agoMDL-38904 Theme - JS improvements for bootstrap.
Damyon Wiese [Mon, 15 Apr 2013 04:14:51 +0000 (12:14 +0800)]
MDL-38904 Theme - JS improvements for bootstrap.

Fix minor whitespace issue in thirdparty lib (will remove exclusion for it from ci).
Update yui-gallery modules location in readme.
Remove code-coverage files.

8 years agoMerge branch 'MDL-38904-m' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 15 Apr 2013 03:57:38 +0000 (11:57 +0800)]
Merge branch 'MDL-38904-m' of git://github.com/andrewnicols/moodle

8 years agoMDL-38716 accessibility: ARIA attributes and roles defined on form actions
Frederic Massart [Thu, 28 Mar 2013 04:12:38 +0000 (12:12 +0800)]
MDL-38716 accessibility: ARIA attributes and roles defined on form actions

8 years agoMDL-39021 Theme - Fix phpdoc @package tags for simple theme
Damyon Wiese [Mon, 15 Apr 2013 03:23:17 +0000 (11:23 +0800)]
MDL-39021 Theme - Fix phpdoc @package tags for simple theme

8 years agoMDL-39021 Themes - Add a new simple theme based on bootstrap.
Mary Evans [Mon, 15 Apr 2013 03:15:59 +0000 (11:15 +0800)]
MDL-39021 Themes - Add a new simple theme based on bootstrap.

Credits to:
Mary Evans <lazydaisy@visible-expression.co.uk> and
David Scotson <david.scotson@glasgow.ac.uk>

8 years agoMerge branch 'w15_MDL-35434_m25_storedfilesetting' of git://github.com/skodak/moodle.git
Damyon Wiese [Mon, 15 Apr 2013 03:01:27 +0000 (11:01 +0800)]
Merge branch 'w15_MDL-35434_m25_storedfilesetting' of git://github.com/skodak/moodle.git

8 years agoMDL-35434 add support for theme setting files
Petr Škoda [Wed, 10 Apr 2013 08:57:18 +0000 (10:57 +0200)]
MDL-35434 add support for theme setting files

This patch is based on work by Gareth J Barnard, Pau Ferrer Ocaña (crazyserver) and others.

8 years agoMDL-35434 new stored file config setting
Petr Škoda [Tue, 9 Apr 2013 18:43:28 +0000 (20:43 +0200)]
MDL-35434 new stored file config setting

8 years agoMDL-39092 Yuilib - remove more -coverage.js files
Damyon Wiese [Mon, 15 Apr 2013 00:58:12 +0000 (08:58 +0800)]
MDL-39092 Yuilib - remove more -coverage.js files

Also slight tweak to the readme for someone who does not know shifter.

8 years agoMerge branch 'MDL-39092-m' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 15 Apr 2013 00:56:27 +0000 (08:56 +0800)]
Merge branch 'MDL-39092-m' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38617_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 15 Apr 2013 00:33:17 +0000 (02:33 +0200)]
Merge branch 'MDL-38617_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38947_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 15 Apr 2013 00:22:23 +0000 (02:22 +0200)]
Merge branch 'MDL-38947_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38948_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 15 Apr 2013 00:22:06 +0000 (02:22 +0200)]
Merge branch 'MDL-38948_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38949_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 15 Apr 2013 00:19:58 +0000 (02:19 +0200)]
Merge branch 'MDL-38949_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38962_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 15 Apr 2013 00:08:35 +0000 (02:08 +0200)]
Merge branch 'MDL-38962_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38960_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Sun, 14 Apr 2013 23:59:21 +0000 (01:59 +0200)]
Merge branch 'MDL-38960_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-39089_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Sun, 14 Apr 2013 23:57:01 +0000 (01:57 +0200)]
Merge branch 'MDL-39089_master' of git://github.com/dmonllao/moodle

8 years agoMDL-37762 navbar: shows categories for current course again
Sam Hemelryk [Sun, 14 Apr 2013 23:25:53 +0000 (11:25 +1200)]
MDL-37762 navbar: shows categories for current course again

8 years agoMDL-39092 JavaScript: Add default Shifter configuration
Andrew Nicols [Sun, 14 Apr 2013 16:41:06 +0000 (17:41 +0100)]
MDL-39092 JavaScript: Add default Shifter configuration

The settings here ensure that -coverage.js files are not built, and that
the Shifter defaults to using the jshint configuration in the moodle root
directory.

8 years agoMDL-39092 JavaScript: Ignore all upstream YUI coverage JS
Andrew Nicols [Sun, 14 Apr 2013 16:33:32 +0000 (17:33 +0100)]
MDL-39092 JavaScript: Ignore all upstream YUI coverage JS

8 years agoMDL-39092 JavaScript: Remove all upstream YUI coverage JS files
Andrew Nicols [Sun, 14 Apr 2013 16:32:26 +0000 (17:32 +0100)]
MDL-39092 JavaScript: Remove all upstream YUI coverage JS files

8 years agoMDL-39092 JavaScript: Ignore all Moodle YUI coverage JS
Andrew Nicols [Sun, 14 Apr 2013 16:30:58 +0000 (17:30 +0100)]
MDL-39092 JavaScript: Ignore all Moodle YUI coverage JS

8 years agoMDL-39092 JavaScript: Remove Moodle YUI coverage JS files
Andrew Nicols [Sun, 14 Apr 2013 16:30:08 +0000 (17:30 +0100)]
MDL-39092 JavaScript: Remove Moodle YUI coverage JS files

8 years agoMDL-39068 use cross-db text column ORDER BY
Eloy Lafuente (stronk7) [Sun, 14 Apr 2013 14:07:43 +0000 (16:07 +0200)]
MDL-39068 use cross-db text column ORDER BY

Credit goes to Valerii Kuznetsov, thanks!

8 years agoMDL-38947 behat: New test
David Monllao [Sun, 14 Apr 2013 07:02:39 +0000 (15:02 +0800)]
MDL-38947 behat: New test

According to MDLQA-73, in a lesson
activity, students can navigate through
a series of pages in various ways
depending upon their answers to questions.

8 years agoMDL-38948 behat: New test
David Monllao [Sun, 14 Apr 2013 05:03:27 +0000 (13:03 +0800)]
MDL-38948 behat: New test

According to MDLQA-76, a teacher can
set a time limit for a lesson activity.

8 years agoMDL-38617 behat: New test
David Monllao [Sun, 14 Apr 2013 04:32:34 +0000 (12:32 +0800)]
MDL-38617 behat: New test

According to MDLQA-1178, an administrator
can filter user accounts by role, cohort
and other variables.

8 years agoMDL-38949 behat: New test
David Monllao [Sun, 14 Apr 2013 03:09:03 +0000 (11:09 +0800)]
MDL-38949 behat: New test

According to MDLQA-81, a teacher can
password protect a lesson and/or set
available from and deadline dates.

8 years agoMDL-38949 behat: Fix editor presence detection issue
David Monllao [Sun, 14 Apr 2013 03:07:33 +0000 (11:07 +0800)]
MDL-38949 behat: Fix editor presence detection issue

Checking not only the presence of an editor
in the page, also an editor for the target
field.

8 years agoMDL-38949 behat: Form field for selectyesno
David Monllao [Sun, 14 Apr 2013 02:58:20 +0000 (10:58 +0800)]
MDL-38949 behat: Form field for selectyesno

Silly extension of behat_form_select.

8 years agoMDL-38962 behat: New test
David Monllao [Fri, 12 Apr 2013 06:26:28 +0000 (14:26 +0800)]
MDL-38962 behat: New test

According to MDLQA-112, there is a choice
of formats for editing a wiki page.

8 years agoMDL-38960 behat: New test
David Monllao [Fri, 12 Apr 2013 05:22:59 +0000 (13:22 +0800)]
MDL-38960 behat: New test

According to MDLQA-111, a history of each
wiki page is available.

8 years agoMDL-37762: Breadcrumb not showing categories on course page
Paul Nicholls [Fri, 12 Apr 2013 04:40:12 +0000 (16:40 +1200)]
MDL-37762: Breadcrumb not showing categories on course page

8 years agoMDL-38089 mod_wiki: Fix incorrect links
David Monllao [Fri, 12 Apr 2013 04:14:13 +0000 (12:14 +0800)]
MDL-38089 mod_wiki: Fix incorrect links

8 years agoMDL-29877 Grades - Remove hardcoded prefix from upgrade steps
Damyon Wiese [Fri, 12 Apr 2013 03:53:48 +0000 (11:53 +0800)]
MDL-29877 Grades - Remove hardcoded prefix from upgrade steps

8 years agoMDL-29877 Grades - version bump for upgrade step.
Damyon Wiese [Fri, 12 Apr 2013 03:16:23 +0000 (11:16 +0800)]
MDL-29877 Grades - version bump for upgrade step.

8 years agoMerge branch 'MDL-29877_bad_grade_item' of git://github.com/andyjdavis/moodle
Damyon Wiese [Fri, 12 Apr 2013 03:14:10 +0000 (11:14 +0800)]
Merge branch 'MDL-29877_bad_grade_item' of git://github.com/andyjdavis/moodle

Conflicts:
version.php

8 years agoMerge branch 'MDL-39054' of git://github.com/jacks92/moodle
Dan Poltawski [Fri, 12 Apr 2013 03:08:28 +0000 (11:08 +0800)]
Merge branch 'MDL-39054' of git://github.com/jacks92/moodle

8 years agoMerge branch 'MDL-39011_master' of github.com:totara/openbadges
Dan Poltawski [Fri, 12 Apr 2013 02:45:00 +0000 (10:45 +0800)]
Merge branch 'MDL-39011_master' of github.com:totara/openbadges

8 years agoMerge branch 'MDL-39049_master' of github.com:totara/openbadges
Dan Poltawski [Fri, 12 Apr 2013 02:30:10 +0000 (10:30 +0800)]
Merge branch 'MDL-39049_master' of github.com:totara/openbadges

8 years agoMerge branch 'MDL-37537' of git://github.com/srynot4sale/moodle
Dan Poltawski [Fri, 12 Apr 2013 02:26:05 +0000 (10:26 +0800)]
Merge branch 'MDL-37537' of git://github.com/srynot4sale/moodle

8 years agoMerge branch 'MDL-38637-master' of github.com:StudiUM/moodle
Dan Poltawski [Fri, 12 Apr 2013 02:08:45 +0000 (10:08 +0800)]
Merge branch 'MDL-38637-master' of github.com:StudiUM/moodle

8 years agoMerge branch 'integration_MDL-38997' of github.com:totara/moodle
Dan Poltawski [Fri, 12 Apr 2013 01:59:49 +0000 (09:59 +0800)]
Merge branch 'integration_MDL-38997' of github.com:totara/moodle

8 years agoMDL-38637 CAS Authentication: Undefined index: QUERY_STRING when executing cron
Jean-Philippe Gaudreau [Thu, 11 Apr 2013 13:02:37 +0000 (09:02 -0400)]
MDL-38637 CAS Authentication: Undefined index: QUERY_STRING when executing cron

8 years agoMerge branch 'MDL-38828_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 14:44:47 +0000 (16:44 +0200)]
Merge branch 'MDL-38828_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38961_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 14:32:32 +0000 (16:32 +0200)]
Merge branch 'MDL-38961_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38963_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 14:30:08 +0000 (16:30 +0200)]
Merge branch 'MDL-38963_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38940_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 14:11:40 +0000 (16:11 +0200)]
Merge branch 'MDL-38940_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38957_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 13:56:45 +0000 (15:56 +0200)]
Merge branch 'MDL-38957_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38958_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 13:52:53 +0000 (15:52 +0200)]
Merge branch 'MDL-38958_master' of git://github.com/dmonllao/moodle

8 years agoMDL-39054 quiz statistics: move hard-coded text to lang file
Jayesh Anandani [Wed, 10 Apr 2013 19:44:32 +0000 (01:14 +0530)]
MDL-39054 quiz statistics: move hard-coded text to lang file

8 years agoon demand release 2.5beta+
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 10:38:46 +0000 (12:38 +0200)]
on demand release 2.5beta+

8 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 10:32:32 +0000 (12:32 +0200)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

8 years agoMDL-38961 behat: New test
David Monllao [Thu, 11 Apr 2013 07:58:56 +0000 (15:58 +0800)]
MDL-38961 behat: New test

According to MDLQA-110, edited wiki
pages may be previewed before saving.

8 years agoMDL-38963 behat: New test
David Monllao [Thu, 11 Apr 2013 07:41:47 +0000 (15:41 +0800)]
MDL-38963 behat: New test

According to MDLQA-113, a teacher can
set a wiki to be collaborative or
individual.

8 years agoMDL-38940 behat: New test
David Monllao [Thu, 11 Apr 2013 02:47:10 +0000 (10:47 +0800)]
MDL-38940 behat: New test

According to MDLQA-32, glossary entries
can be searched or browsed by alphabet,
category, date or author.

8 years agoMDL-38957 behat: New test
David Monllao [Thu, 11 Apr 2013 06:35:32 +0000 (14:35 +0800)]
MDL-38957 behat: New test

According to MDLQA-94, a teacher can
sort questions in the question bank.

8 years agoMDL-38958 behat: New test
David Monllao [Thu, 11 Apr 2013 03:44:48 +0000 (11:44 +0800)]
MDL-38958 behat: New test

According to MDLQA-91, a teacher can
edit questions in the question bank.

8 years agoRevert "MDL-38254 Assignment Module: add avaialble message to all assignment types"
Dan Poltawski [Thu, 11 Apr 2013 08:52:25 +0000 (16:52 +0800)]
Revert "MDL-38254 Assignment Module: add avaialble message to all assignment types"

This reverts commit 2612e21bd4450bf94b7e5ac259e2d0b0b3bbcf7b.

8 years agoMDL-38958 behat: Step definitions to interact with popup windows
David Monllao [Thu, 11 Apr 2013 05:34:22 +0000 (13:34 +0800)]
MDL-38958 behat: Step definitions to interact with popup windows

8 years agoMDL-38958 behat: Step definition to add questions
David Monllao [Thu, 11 Apr 2013 03:44:16 +0000 (11:44 +0800)]
MDL-38958 behat: Step definition to add questions

8 years agoMDL-38940 behat: Step definition to create glossary categories
David Monllao [Thu, 11 Apr 2013 02:46:11 +0000 (10:46 +0800)]
MDL-38940 behat: Step definition to create glossary categories

8 years agoMerge branch 'm25_MDL-39061_Trivial_incorrect_MD' of https://github.com/scara/moodle
Dan Poltawski [Thu, 11 Apr 2013 02:19:10 +0000 (10:19 +0800)]
Merge branch 'm25_MDL-39061_Trivial_incorrect_MD' of https://github.com/scara/moodle

8 years agoMerge branch 'MDL-38525-master' of https://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Wed, 10 Apr 2013 22:56:45 +0000 (00:56 +0200)]
Merge branch 'MDL-38525-master' of https://github.com/damyon/moodle

8 years agoMerge branch 'MDL-38937_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 10 Apr 2013 22:43:59 +0000 (00:43 +0200)]
Merge branch 'MDL-38937_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38939_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 10 Apr 2013 22:32:40 +0000 (00:32 +0200)]
Merge branch 'MDL-38939_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38970_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 10 Apr 2013 22:22:42 +0000 (00:22 +0200)]
Merge branch 'MDL-38970_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'w15_MDL-38989_m25_ttfinal' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 10 Apr 2013 13:45:16 +0000 (15:45 +0200)]
Merge branch 'w15_MDL-38989_m25_ttfinal' of git://github.com/skodak/moodle

8 years agoMDL-38970 behat: New test
David Monllao [Tue, 9 Apr 2013 03:56:18 +0000 (11:56 +0800)]
MDL-38970 behat: New test

According to MDLQA-65, a teacher can
prevent or allow assignment submission
changes.

8 years agoMDL-38939 behat: New test
David Monllao [Wed, 10 Apr 2013 08:51:35 +0000 (16:51 +0800)]
MDL-38939 behat: New test

According to MDLQA-33, a teacher can set
whether glossary entries are always editable.

8 years agoMDL-38939 behat: Allow admin setting to be set in non-JS sessions
David Monllao [Wed, 10 Apr 2013 08:50:52 +0000 (16:50 +0800)]
MDL-38939 behat: Allow admin setting to be set in non-JS sessions

8 years agoMDL-38937 behat: New test
David Monllao [Wed, 10 Apr 2013 08:44:35 +0000 (16:44 +0800)]
MDL-38937 behat: New test

According to MDLQA-39, a teacher can
choose whether to provide a printer-friendly
glossary entries list

8 years agoMDL-38525: Assignment upgrade - Error with comments for unenrolled students.
Damyon Wiese [Wed, 10 Apr 2013 08:09:56 +0000 (16:09 +0800)]
MDL-38525: Assignment upgrade - Error with comments for unenrolled students.

Students with comments on 'upload' assignments cause errors for the upgrade
tool if they are no longer enrolled. The solution is to allow siteadmin to
see student submissions even if the student is not currently enrolled (you
must be siteadmin to run the upgrade tool).

8 years agoMDL-38989 add missing test timeout reset
Petr Škoda [Wed, 10 Apr 2013 07:49:19 +0000 (09:49 +0200)]
MDL-38989 add missing test timeout reset

8 years agoMDL-38989 detect changed timeout in tests
Petr Škoda [Wed, 10 Apr 2013 07:43:47 +0000 (09:43 +0200)]
MDL-38989 detect changed timeout in tests

The trouble is that PHPUnit should ideally test mostly low level libraries that should not change the timeouts.

8 years agoMerge branch 'MDL-38973-master' of https://github.com/damyon/moodle
Dan Poltawski [Wed, 10 Apr 2013 06:48:49 +0000 (14:48 +0800)]
Merge branch 'MDL-38973-master' of https://github.com/damyon/moodle

8 years agoMDL-38525: Assignment - print exception message when assignment upgrade fails.
Ryan Panning [Wed, 10 Apr 2013 06:38:05 +0000 (14:38 +0800)]
MDL-38525: Assignment - print exception message when assignment upgrade fails.

Change to use getMessage() from the Exception class will prevent "{$a}" when
$e->error is null.

8 years agoMerge branch 'MDL-19072' of git://github.com/jmvedrine/moodle
Dan Poltawski [Wed, 10 Apr 2013 06:10:37 +0000 (14:10 +0800)]
Merge branch 'MDL-19072' of git://github.com/jmvedrine/moodle

8 years agoMDL-38973 Assignment - Attempt history not displaying for blind marking
Damyon Wiese [Wed, 10 Apr 2013 05:44:42 +0000 (13:44 +0800)]
MDL-38973 Assignment - Attempt history not displaying for blind marking

This change makes the attempt history display for teachers and students
even when there is no grade (e.g. blind marking). It also will show the previous
attempt in the grading table when a submission has been newly reopened (instead
of a blank submission).

8 years agoMDL-26649 forms: ensure that both necessary variables are set before altering calenda...
Mark Nelson [Wed, 10 Apr 2013 03:18:17 +0000 (11:18 +0800)]
MDL-26649 forms: ensure that both necessary variables are set before altering calendar image

8 years agoMerge branch 'wip-mdl-35883' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 10 Apr 2013 04:16:23 +0000 (12:16 +0800)]
Merge branch 'wip-mdl-35883' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-38254' of git://github.com/rwijaya/moodle
Dan Poltawski [Wed, 10 Apr 2013 04:08:46 +0000 (12:08 +0800)]
Merge branch 'MDL-38254' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-39041-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 10 Apr 2013 03:57:49 +0000 (11:57 +0800)]
Merge branch 'MDL-39041-master' of git://github.com/damyon/moodle

8 years agoMDL-39041 Assignment - Fix regression in "allow submission changes".
Damyon Wiese [Wed, 10 Apr 2013 03:30:41 +0000 (11:30 +0800)]
MDL-39041 Assignment - Fix regression in "allow submission changes".

A typo was introduced in the assignment attempt history feature that broke
unlock submissions. This was detected by the new behat test in MDL-38970 (yay).

8 years agoMerge branch 'MDL-38935' of git://github.com/timhunt/moodle
Damyon Wiese [Wed, 10 Apr 2013 03:17:31 +0000 (11:17 +0800)]
Merge branch 'MDL-38935' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-38030-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Wed, 10 Apr 2013 03:11:47 +0000 (11:11 +0800)]
Merge branch 'MDL-38030-master' of git://github.com/mouneyrac/moodle

8 years agoMerge branch 'MDL-38933-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 10 Apr 2013 03:09:05 +0000 (11:09 +0800)]
Merge branch 'MDL-38933-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-22153' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 10 Apr 2013 02:58:32 +0000 (10:58 +0800)]
Merge branch 'MDL-22153' of git://github.com/stronk7/moodle

8 years agoMerge branch 'MDL-39059-workshop-settype' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 10 Apr 2013 02:55:45 +0000 (10:55 +0800)]
Merge branch 'MDL-39059-workshop-settype' of git://github.com/mudrd8mz/moodle

8 years agoMerge branch 'MDL-37410-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Wed, 10 Apr 2013 02:37:29 +0000 (10:37 +0800)]
Merge branch 'MDL-37410-master' of git://github.com/mouneyrac/moodle

8 years agoMerge branch 'MDL-38999' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 10 Apr 2013 02:35:40 +0000 (10:35 +0800)]
Merge branch 'MDL-38999' of git://github.com/stronk7/moodle

8 years agoMDL-29877 core_grade:add some upgrade code to fix broken grade items introduced by...
Andrew Davis [Fri, 5 Apr 2013 01:52:08 +0000 (09:52 +0800)]
MDL-29877 core_grade:add some upgrade code to fix broken grade items introduced by bad restores

8 years agoFix error when awarding a badge from recipients page
Yuliya Bozhko [Tue, 9 Apr 2013 23:00:08 +0000 (11:00 +1200)]
Fix error when awarding a badge from recipients page

8 years agoMDL-38904 Theme: Correct data-target for navbar
Andrew Nicols [Tue, 9 Apr 2013 22:26:20 +0000 (23:26 +0100)]
MDL-38904 Theme: Correct data-target for navbar

8 years agoMDL-38904 Theme/JavaScript: Tidy up bootstrap JS
Andrew Nicols [Tue, 9 Apr 2013 21:25:05 +0000 (22:25 +0100)]
MDL-38904 Theme/JavaScript: Tidy up bootstrap JS