moodle.git
8 years agoMerge branch 'wip-MDL-38442-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
Dan Poltawski [Tue, 9 Apr 2013 07:40:38 +0000 (15:40 +0800)]
Merge branch 'wip-MDL-38442-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38766/MOODLE_23_STABLE' of github.com:kemitix/moodle into MOODLE_23...
Dan Poltawski [Tue, 9 Apr 2013 02:38:22 +0000 (10:38 +0800)]
Merge branch 'MDL-38766/MOODLE_23_STABLE' of github.com:kemitix/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-MDL-38541-m23' of git://github.com/marinaglancy/moodle into MOODLE_...
Dan Poltawski [Tue, 9 Apr 2013 01:48:27 +0000 (09:48 +0800)]
Merge branch 'wip-MDL-38541-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

8 years agoMDL-38541 Restrict calling rebuild_course_cache() from upgrade process
Marina Glancy [Tue, 9 Apr 2013 01:17:47 +0000 (11:17 +1000)]
MDL-38541 Restrict calling rebuild_course_cache() from upgrade process

only plugins upgrade scripts can call rebuild_course_cache() and for clearing cache only.

8 years agoMerge branch 'w14_MDL-38753_m23_ocicount' of git://github.com/skodak/moodle into...
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 00:25:54 +0000 (02:25 +0200)]
Merge branch 'w14_MDL-38753_m23_ocicount' of git://github.com/skodak/moodle into MOODLE_23_STABLE

8 years agoMDL-39028 fix sqlsrv concat type conversion
Petr Škoda [Mon, 8 Apr 2013 11:17:56 +0000 (13:17 +0200)]
MDL-39028 fix sqlsrv concat type conversion

8 years agoMDL-38442 navigation: set_expansion_limit now only hides structural nodes
Sam Hemelryk [Tue, 9 Apr 2013 00:06:26 +0000 (12:06 +1200)]
MDL-38442 navigation: set_expansion_limit now only hides structural nodes

8 years agoMDL-39024 fix MSSQL seek past the end of recordset
Petr Škoda [Mon, 8 Apr 2013 08:36:37 +0000 (10:36 +0200)]
MDL-39024 fix MSSQL seek past the end of recordset

8 years agoMDL-39022 fix MSSQL concat type conversion
Petr Škoda [Mon, 8 Apr 2013 08:19:51 +0000 (10:19 +0200)]
MDL-39022 fix MSSQL concat type conversion

8 years agoMerge branch 'MDL-38912_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:40:06 +0000 (01:40 +0200)]
Merge branch 'MDL-38912_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-39023-parentlang_23' of git://github.com/mudrd8mz/moodle into MOODL...
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 14:58:03 +0000 (16:58 +0200)]
Merge branch 'MDL-39023-parentlang_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

8 years agoMDL-39023 Make get_language_dependencies() aware of circular dependency risk
David Mudrák [Mon, 8 Apr 2013 12:26:23 +0000 (14:26 +0200)]
MDL-39023 Make get_language_dependencies() aware of circular dependency risk

The patch reimplements the core_string_manager::get_language_dependencies()
so that potentially mis-configured language packs with circular
dependencies or self dependency do not make the site unavailable.
Unit tests for the expected behaviour are added.

8 years agoMDL-38753 tweak count SQL to make stupid Oracle happy
Petr Škoda [Mon, 8 Apr 2013 07:23:45 +0000 (09:23 +0200)]
MDL-38753 tweak count SQL to make stupid Oracle happy

8 years agoMerge branch 'MDL-38452-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Damyon Wiese [Mon, 8 Apr 2013 06:08:52 +0000 (14:08 +0800)]
Merge branch 'MDL-38452-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37676_23_STABLE' of git://github.com/appalachianstate/moodle into...
Dan Poltawski [Mon, 8 Apr 2013 06:07:10 +0000 (14:07 +0800)]
Merge branch 'MDL-37676_23_STABLE' of git://github.com/appalachianstate/moodle into MOODLE_23_STABLE

8 years agoMDL-35868: quiz: Use correct attemptnumber when a last attempt exists.
Tim Lock [Thu, 28 Mar 2013 00:45:23 +0000 (11:15 +1030)]
MDL-35868: quiz: Use correct attemptnumber when a last attempt exists.

8 years agoMDL-38912 prevent time-outs during unit tests.
Tim Hunt [Thu, 4 Apr 2013 13:51:25 +0000 (14:51 +0100)]
MDL-38912 prevent time-outs during unit tests.

8 years agoweekly release 2.3.6+
Dan Poltawski [Fri, 5 Apr 2013 10:00:37 +0000 (18:00 +0800)]
weekly release 2.3.6+

8 years agoMerge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23...
Dan Poltawski [Fri, 5 Apr 2013 09:53:03 +0000 (17:53 +0800)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

8 years agoMDL-38766 wiki2.0: fix redirects
Paul Campbell [Fri, 5 Apr 2013 08:26:27 +0000 (09:26 +0100)]
MDL-38766 wiki2.0: fix redirects

Signed-off-by: Paul Campbell <pcampbell@carnegiecollege.ac.uk>
8 years agoAutomatically generated installer lang files
AMOS bot [Thu, 4 Apr 2013 00:36:11 +0000 (00:36 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'MDL-38112-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 22:58:39 +0000 (00:58 +0200)]
Merge branch 'MDL-38112-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38657_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Dan Poltawski [Wed, 3 Apr 2013 08:51:39 +0000 (16:51 +0800)]
Merge branch 'MDL-38657_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38809_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Aparup Banerjee [Wed, 3 Apr 2013 08:33:45 +0000 (16:33 +0800)]
Merge branch 'MDL-38809_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoAutomatically generated installer lang files
AMOS bot [Wed, 3 Apr 2013 00:35:47 +0000 (00:35 +0000)]
Automatically generated installer lang files

8 years agoMDL-35603 backup: fix coding style issues
Dan Poltawski [Tue, 2 Apr 2013 06:30:50 +0000 (14:30 +0800)]
MDL-35603 backup: fix coding style issues

Conflicts:
backup/util/ui/restore_ui_components.php

8 years agoMerge branch 'MDL-35603_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 2 Apr 2013 06:27:39 +0000 (14:27 +0800)]
Merge branch 'MDL-35603_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38713-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Damyon Wiese [Tue, 2 Apr 2013 05:24:19 +0000 (13:24 +0800)]
Merge branch 'MDL-38713-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38703-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Damyon Wiese [Tue, 2 Apr 2013 05:05:28 +0000 (13:05 +0800)]
Merge branch 'MDL-38703-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38700-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Damyon Wiese [Tue, 2 Apr 2013 04:31:52 +0000 (12:31 +0800)]
Merge branch 'MDL-38700-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38702_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 2 Apr 2013 02:04:56 +0000 (10:04 +0800)]
Merge branch 'MDL-38702_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

8 years agoMDL-38657 theme_base: fixes misalignment issue in User Report page.
Mary Evans [Sun, 31 Mar 2013 01:25:47 +0000 (02:25 +0100)]
MDL-38657 theme_base: fixes misalignment issue in User Report page.

8 years agoMDL-38809 quiz manual grading: delete expensive unnecssary code.
Tim Hunt [Sat, 30 Mar 2013 17:25:52 +0000 (17:25 +0000)]
MDL-38809 quiz manual grading: delete expensive unnecssary code.

8 years agoMDL-35603 - Backup - Course import/restore max results
Rex Lorenzo [Sat, 23 Mar 2013 06:16:44 +0000 (23:16 -0700)]
MDL-35603 - Backup - Course import/restore max results

* Unified UI for import and restore course search

8 years agoweekly release 2.3.6+
Damyon Wiese [Thu, 28 Mar 2013 06:47:18 +0000 (14:47 +0800)]
weekly release 2.3.6+

8 years agoMerge branch 'MDL-25631_m23' of git://github.com/merrill-oakland/moodle into MOODLE_2...
Damyon Wiese [Thu, 28 Mar 2013 02:42:18 +0000 (10:42 +0800)]
Merge branch 'MDL-25631_m23' of git://github.com/merrill-oakland/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38659_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
Aparup Banerjee [Wed, 27 Mar 2013 02:39:10 +0000 (10:39 +0800)]
Merge branch 'MDL-38659_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38557_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:42:11 +0000 (23:42 +0100)]
Merge branch 'MDL-38557_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38647_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 22:24:00 +0000 (23:24 +0100)]
Merge branch 'MDL-38647_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-25631 backup Decoupling legacy files from course config settigs. If they are...
Eric Merrill [Tue, 26 Mar 2013 19:18:10 +0000 (15:18 -0400)]
MDL-25631 backup Decoupling legacy files from course config settigs. If they are present, they will be restored.

8 years agoMDL-37782 reset DB after each failed database test
Petr Škoda [Sun, 24 Mar 2013 13:16:28 +0000 (14:16 +0100)]
MDL-37782 reset DB after each failed database test

Conflicts:
lib/phpunit/classes/database_driver_testcase.php

8 years agoMDL-38659 environment: fix incorrect feedback messages
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 14:37:36 +0000 (15:37 +0100)]
MDL-38659 environment: fix incorrect feedback messages

8 years agoMDL-38713 course: correctly set visibleold on mod creation
Dan Poltawski [Tue, 26 Mar 2013 08:16:54 +0000 (16:16 +0800)]
MDL-38713 course: correctly set visibleold on mod creation

Remove uncessary set of visibleold in the form

8 years agoMDL-38703 course: backport visibility tests from MDL-36417
Dan Poltawski [Tue, 26 Mar 2013 07:49:11 +0000 (15:49 +0800)]
MDL-38703 course: backport visibility tests from MDL-36417

8 years agoMDL-38703 course: moving a hidden course module unhides it
Dan Poltawski [Tue, 26 Mar 2013 07:47:18 +0000 (15:47 +0800)]
MDL-38703 course: moving a hidden course module unhides it

When moving to a non-hidden section because visibleold was not
being correctly set. visibleold should only be differnet from visible
when a CM is changed by section visibility

8 years agoMDL-38468 Filelib: Fix ordering of new mimetypes and upgrade step
Damyon Wiese [Tue, 26 Mar 2013 07:29:00 +0000 (15:29 +0800)]
MDL-38468 Filelib: Fix ordering of new mimetypes and upgrade step

8 years agoMDL-38468 Files API: fixed the support for MTHML (MIME HTML: web page archive) files
Matteo Scaramuccia [Thu, 14 Mar 2013 21:41:34 +0000 (22:41 +0100)]
MDL-38468 Files API: fixed the support for MTHML (MIME HTML: web page archive) files

Conflicts:

version.php

8 years agoMDL-38700 course: only change visibility if a module moves to a different section
Charles Fulton [Mon, 25 Mar 2013 20:35:44 +0000 (13:35 -0700)]
MDL-38700 course: only change visibility if a module moves to a different section

8 years agoMDL-38700 course: add tests for moveto_module()
Dan Poltawski [Tue, 26 Mar 2013 07:10:23 +0000 (15:10 +0800)]
MDL-38700 course: add tests for moveto_module()

* Test visibility when moving around hidden sections
* Test for visiblity changes when moving around in the same sections.

8 years agoMerge branch 'wip-MDL-35875-stable23' of git://github.com/phalacee/moodle into MOODLE...
Damyon Wiese [Tue, 26 Mar 2013 06:48:10 +0000 (14:48 +0800)]
Merge branch 'wip-MDL-35875-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-30438_b_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Damyon Wiese [Tue, 26 Mar 2013 06:38:06 +0000 (14:38 +0800)]
Merge branch 'MDL-30438_b_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38380_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Damyon Wiese [Tue, 26 Mar 2013 05:25:16 +0000 (13:25 +0800)]
Merge branch 'MDL-38380_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

8 years agoMDL-38112 - update to the ISO list of countries
Dan Poltawski [Tue, 26 Mar 2013 02:43:01 +0000 (10:43 +0800)]
MDL-38112 - update to the ISO list of countries

According to ISO 3166-1

8 years agoMerge branch 'wip-mdl-36882-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Damyon Wiese [Tue, 26 Mar 2013 02:43:32 +0000 (10:43 +0800)]
Merge branch 'wip-mdl-36882-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

8 years agoMDL-36882 course: Added aria-live for manual completion
Rajesh Taneja [Tue, 26 Mar 2013 02:26:28 +0000 (10:26 +0800)]
MDL-36882 course: Added aria-live for manual completion

This is required so that assistive technologies can notify user about change on completion status

8 years agoMerge branch 'wip-mdl-36125-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Damyon Wiese [Tue, 26 Mar 2013 02:15:08 +0000 (10:15 +0800)]
Merge branch 'wip-mdl-36125-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

8 years agoMDL-38702 theme_mymobile: Replaced missing theme setting to disable CSS Optimiser.
Mary Evans [Tue, 26 Mar 2013 01:01:25 +0000 (01:01 +0000)]
MDL-38702 theme_mymobile: Replaced missing theme setting to disable CSS Optimiser.

The missing setting was a regression casued by MDL-33357.

8 years agoMerge branch 'MDL-38668_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
Damyon Wiese [Mon, 25 Mar 2013 07:51:56 +0000 (15:51 +0800)]
Merge branch 'MDL-38668_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

8 years agoMDL-35875 - Accessibility - Remove empty summary attribute for user information table...
Jason Fowler [Thu, 14 Mar 2013 02:00:07 +0000 (10:00 +0800)]
MDL-35875 - Accessibility - Remove empty summary attribute for user information table in view user's profile

8 years agoMDL-37033 Environment - Fix indenting in XML
Damyon Wiese [Mon, 25 Mar 2013 01:38:30 +0000 (09:38 +0800)]
MDL-37033 Environment - Fix indenting in XML

8 years agoMerge branch 'MDL-37033_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
Damyon Wiese [Mon, 25 Mar 2013 01:37:07 +0000 (09:37 +0800)]
Merge branch 'MDL-37033_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

8 years agoMDL-38658 JavaScript: Correct fullpath for dndupload definition
Andrew Robert Nicols [Fri, 22 Mar 2013 17:29:56 +0000 (17:29 +0000)]
MDL-38658 JavaScript: Correct fullpath for dndupload definition

8 years agoMerge branch 'MDL-36927-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
Eloy Lafuente (stronk7) [Sun, 24 Mar 2013 22:39:42 +0000 (23:39 +0100)]
Merge branch 'MDL-36927-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

8 years agoMDL-38668 timezones: update to tzdata 2013b
Eloy Lafuente (stronk7) [Sun, 24 Mar 2013 09:46:33 +0000 (10:46 +0100)]
MDL-38668 timezones: update to tzdata 2013b

8 years agoMDL-37033 environment: add 2.5 brach details
Eloy Lafuente (stronk7) [Fri, 22 Mar 2013 15:08:07 +0000 (16:08 +0100)]
MDL-37033 environment: add 2.5 brach details

8 years agoMDL-37676 Use course grade category if mapping fails for manual grade items
Fred Woolard [Fri, 25 Jan 2013 16:02:41 +0000 (11:02 -0500)]
MDL-37676 Use course grade category if mapping fails for manual grade items

8 years agoMDL-38647 quiz review question issue
Tim Hunt [Fri, 22 Mar 2013 11:16:02 +0000 (11:16 +0000)]
MDL-38647 quiz review question issue

Page URL should contain 'step=0' if necessary, but not 'step='.

8 years agoMDL-38557 quiz manual grading should check mod/quiz:grade
Tim Hunt [Tue, 19 Mar 2013 17:51:41 +0000 (17:51 +0000)]
MDL-38557 quiz manual grading should check mod/quiz:grade

8 years agoweekly release 2.3.6+
Damyon Wiese [Fri, 22 Mar 2013 05:43:28 +0000 (13:43 +0800)]
weekly release 2.3.6+

8 years agoMerge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23...
Damyon Wiese [Fri, 22 Mar 2013 05:35:42 +0000 (13:35 +0800)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

8 years agoMDL-36125 course: Added aria-describedby for editing activity title
Rajesh Taneja [Fri, 22 Mar 2013 04:39:24 +0000 (12:39 +0800)]
MDL-36125 course: Added aria-describedby for editing activity title

8 years agoMerge branch 'MDL-37664-23-int' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Thu, 21 Mar 2013 09:56:31 +0000 (10:56 +0100)]
Merge branch 'MDL-37664-23-int' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

8 years agoMDL-37664 blocks: Unexisting function for RTL in drag & drop
Frederic Massart [Thu, 21 Mar 2013 09:46:28 +0000 (17:46 +0800)]
MDL-37664 blocks: Unexisting function for RTL in drag & drop

8 years agoAutomatically generated installer lang files
AMOS bot [Thu, 21 Mar 2013 00:37:32 +0000 (00:37 +0000)]
Automatically generated installer lang files

8 years agoMDL-38364 phpunit: PHPUnit autoload uses capital A
David Monllao [Wed, 20 Mar 2013 07:45:00 +0000 (15:45 +0800)]
MDL-38364 phpunit: PHPUnit autoload uses capital A

8 years agoMDL-36927 Reports: Page layout is not defined in course/recent.php
Ankit Agarwal [Wed, 20 Mar 2013 06:11:09 +0000 (14:11 +0800)]
MDL-36927 Reports: Page layout is not defined in course/recent.php

8 years agoMDL-38373 Auth - Additional strict warning fix for radius authentication
Damyon Wiese [Wed, 20 Mar 2013 04:41:39 +0000 (12:41 +0800)]
MDL-38373 Auth - Additional strict warning fix for radius authentication

8 years agoMerge branch 'MDL-38373_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
Damyon Wiese [Wed, 20 Mar 2013 04:40:01 +0000 (12:40 +0800)]
Merge branch 'MDL-38373_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

8 years agoMDL-38452 repositories: User logged in as have access to non-private repositories
Frederic Massart [Wed, 20 Mar 2013 04:39:33 +0000 (12:39 +0800)]
MDL-38452 repositories: User logged in as have access to non-private repositories

8 years agoRevert "MDL-38515 JavaScript: Correct module dependencies for core_filepicker"
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 23:58:04 +0000 (00:58 +0100)]
Revert "MDL-38515 JavaScript: Correct module dependencies for core_filepicker"

This reverts commit e40c3f7cc48eb66737def5a7aee14ee2aa986990.

8 years agoMerge branch 'MDL-38490_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 23:43:49 +0000 (00:43 +0100)]
Merge branch 'MDL-38490_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38370-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 23:32:09 +0000 (00:32 +0100)]
Merge branch 'MDL-38370-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'w12_MDL-38364_m23_phpunitloading' of git://github.com/skodak/moodle...
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 23:21:58 +0000 (00:21 +0100)]
Merge branch 'w12_MDL-38364_m23_phpunitloading' of git://github.com/skodak/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37664-MOODLE_23_STABLE' of https://github.com/lucisgit/moodle into...
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 22:37:49 +0000 (23:37 +0100)]
Merge branch 'MDL-37664-MOODLE_23_STABLE' of https://github.com/lucisgit/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38424_m23' of git://github.com/kordan/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 22:18:59 +0000 (23:18 +0100)]
Merge branch 'MDL-38424_m23' of git://github.com/kordan/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38395_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 22:13:16 +0000 (23:13 +0100)]
Merge branch 'MDL-38395_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38460_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 20:17:19 +0000 (21:17 +0100)]
Merge branch 'MDL-38460_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-MDL-38422_M23' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 20:13:22 +0000 (21:13 +0100)]
Merge branch 'wip-MDL-38422_M23' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38363_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 20:07:29 +0000 (21:07 +0100)]
Merge branch 'MDL-38363_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38355_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 20:01:24 +0000 (21:01 +0100)]
Merge branch 'MDL-38355_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38388_23' of git://github.com/jonof/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 18:03:37 +0000 (19:03 +0100)]
Merge branch 'MDL-38388_23' of git://github.com/jonof/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38412_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 17:23:04 +0000 (18:23 +0100)]
Merge branch 'MDL-38412_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'w12_MDL-38329_m23_webkit' of git://github.com/skodak/moodle into MOODLE...
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 17:18:05 +0000 (18:18 +0100)]
Merge branch 'w12_MDL-38329_m23_webkit' of git://github.com/skodak/moodle into MOODLE_23_STABLE

8 years agoMDL-38202 fix loginas logout redirection
Petr Škoda [Sun, 17 Mar 2013 19:51:25 +0000 (20:51 +0100)]
MDL-38202 fix loginas logout redirection

8 years agoMerge branch 'MDL-38542_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 15:49:45 +0000 (16:49 +0100)]
Merge branch 'MDL-38542_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38444_23' of https://github.com/ppichet/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 15:35:41 +0000 (16:35 +0100)]
Merge branch 'MDL-38444_23' of https://github.com/ppichet/moodle into MOODLE_23_STABLE

8 years agoMDL-38542 shortanswer qtype: was broken for responses of '0'.
Tim Hunt [Tue, 19 Mar 2013 13:40:51 +0000 (13:40 +0000)]
MDL-38542 shortanswer qtype: was broken for responses of '0'.

This was a regression caused by MDL-37157 & MDL-37746.

8 years agoMerge branch 'MDL-38515-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 11:58:42 +0000 (12:58 +0100)]
Merge branch 'MDL-38515-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-38397_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 11:29:01 +0000 (12:29 +0100)]
Merge branch 'MDL-38397_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-mdl-38431-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 09:24:45 +0000 (10:24 +0100)]
Merge branch 'wip-mdl-38431-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE