Eloy Lafuente (stronk7) [Wed, 24 Apr 2013 21:37:17 +0000 (23:37 +0200)]
Merge branch 'MDL-35364_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Wed, 24 Apr 2013 13:36:26 +0000 (14:36 +0100)]
Merge branch 'MDL-39283_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Ruslan Kabalin [Mon, 15 Apr 2013 09:30:36 +0000 (10:30 +0100)]
MDL-34939: Fix clamdscan permissions-related issues
Use --fdpass parameter that passes the file descriptor permissions to clamd,
which allows to scan given file irrespective of directory and file
permissions. Changing file permissions is not required.
Jean-Michel Vedrine [Mon, 22 Apr 2013 14:21:54 +0000 (16:21 +0200)]
MDL-39283 GIFT and XML question export broken for unsupported qtypes
Do no write any data to the export for unsupported qtypes
Damyon Wiese [Tue, 23 Apr 2013 04:02:30 +0000 (12:02 +0800)]
Merge branch 'MDL-34933_23_STABLE' of https://github.com/mchurchward/moodle into MOODLE_23_STABLE
Conflicts:
lib/db/upgrade.php
version.php
Tim Hunt [Mon, 22 Apr 2013 18:21:40 +0000 (19:21 +0100)]
MDL-35364 shorten text: don't return invalid HTML.
I also broke the unit tests into more, smaller, named tests, so that
when things start failing, more tests are run, and it is clearer what
the problem is.
In a couple of cases, I adjusted the $ideal lenght in the test. A
careful counting of the characters in the test input (added as comments)
suggests that the new values make for better tests.
Alex Leontiev [Sat, 20 Apr 2013 07:32:27 +0000 (15:32 +0800)]
MDL-37514 module.js: fix .js for auto quiz submission in preview mode
The issue: when we attempt the quiz as teacher/admin and timer is up,
quiz is not submitted, even though "Open attempts are submitted
automatically" is set. I've changed the javascript for a timer,
responsible for submission, removing the special behaviour in case of
preview mode. Note, that when the admin/teacher is taking a quiz, the
"preview" mode is automatically switched on.
It is a bit strange, since in the javascript there was clearly no
expressed intention to really submit quiz in preview, even when timer
hits. It does not really seem like a accidental bug, rather it looks
like some misunderstanding. Worse still, it may happen that I did not
understand the intentions of previous editor and ruined some
functionality. Because of this, and the fact that this is my first bug,
I would like to ask about the peer review! Please, see my comments in
bug discussion for the testing steps.
Mike Churchward [Wed, 17 Apr 2013 14:18:55 +0000 (10:18 -0400)]
MDL-34933 core_message: Adding index to improve database access on message_working table.
Jason Platts [Tue, 2 Apr 2013 08:16:00 +0000 (09:16 +0100)]
MDL-37942 Images with non-alphanumeric chars in file name won't export
Damyon Wiese [Mon, 22 Apr 2013 02:36:20 +0000 (10:36 +0800)]
MDL-39050 quiz access rules: $module->is_enabled() not available for 23
Damyon Wiese [Mon, 22 Apr 2013 02:31:30 +0000 (10:31 +0800)]
Merge branch 'MDL-39050_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 21 Apr 2013 23:01:42 +0000 (11:01 +1200)]
Merge branch 'MDL-39172_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Dan Poltawski [Fri, 19 Apr 2013 14:12:00 +0000 (15:12 +0100)]
Merge branch 'MDL-38361_23' of https://github.com/prateeksachan/moodle into MOODLE_23_STABLE
Tim Hunt [Wed, 17 Apr 2013 12:15:10 +0000 (13:15 +0100)]
MDL-39050 quiz access rules: settings.php files should work.
Damyon Wiese [Fri, 19 Apr 2013 06:07:38 +0000 (14:07 +0800)]
Merge branch 'MDL-39084-moodle23' of github.com:StudiUM/moodle into MOODLE_23_STABLE
Damyon Wiese [Fri, 19 Apr 2013 05:29:41 +0000 (13:29 +0800)]
Merge branch 'MDL-39167_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Sam Hemelryk [Fri, 19 Apr 2013 01:53:19 +0000 (13:53 +1200)]
Merge branch 'MDL-39185_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
Jean-Michel Vedrine [Tue, 16 Apr 2013 20:04:55 +0000 (22:04 +0200)]
MDL-39172 Import of .dat files is broken in blackboard_six import format
Dan Poltawski [Thu, 18 Apr 2013 11:48:44 +0000 (12:48 +0100)]
weekly release 2.3.6+
Dan Poltawski [Thu, 18 Apr 2013 11:43:54 +0000 (12:43 +0100)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
Dan Poltawski [Thu, 18 Apr 2013 07:36:32 +0000 (08:36 +0100)]
Merge branch 'MDL-39203-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Frederic Massart [Thu, 18 Apr 2013 06:47:22 +0000 (14:47 +0800)]
MDL-39203 repository: Fixed authentication errors with Dropbox
Dan Poltawski [Wed, 17 Apr 2013 13:38:18 +0000 (14:38 +0100)]
Merge branch 'MDL-38824-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
Tim Hunt [Wed, 17 Apr 2013 13:24:38 +0000 (14:24 +0100)]
MDL-39167 quiz access rules: need to validate their settings.
We were missing the hook in the form validation method. We had them
everywhere else they were needed.
Mark Nelson [Wed, 17 Apr 2013 06:52:48 +0000 (14:52 +0800)]
MDL-39185 mod_forum: declare new object before creating member variables to prevent Strict Standards warning
Jean-Philippe Gaudreau [Tue, 16 Apr 2013 13:30:19 +0000 (09:30 -0400)]
MDL-39084 grade: Capability checks are incoherent for the Course grade settings section
Dan Poltawski [Tue, 16 Apr 2013 11:45:14 +0000 (12:45 +0100)]
Merge branch 'MDL-39080_M23' of git://github.com/kordan/moodle into MOODLE_23_STABLE
Daniel Neis Araujo [Thu, 21 Feb 2013 12:49:00 +0000 (09:49 -0300)]
MDL-38136: fix user_get_user_details doesn't return idnumber (thanks to Antonio Carlos Mariani)
Damyon Wiese [Tue, 16 Apr 2013 07:14:19 +0000 (15:14 +0800)]
Merge branch 'wip-MDL-38055-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 15 Apr 2013 15:25:30 +0000 (16:25 +0100)]
Merge branch 'MDL-38880_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 15 Apr 2013 07:30:32 +0000 (08:30 +0100)]
Merge branch 'MDL-39000-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
Damyon Wiese [Mon, 15 Apr 2013 06:24:26 +0000 (14:24 +0800)]
Merge branch 'MDL-39068_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Sun, 14 Apr 2013 23:58:01 +0000 (01:58 +0200)]
Merge branch 'MDL-39089_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE
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!
AMOS bot [Sat, 13 Apr 2013 00:37:26 +0000 (00:37 +0000)]
Automatically generated installer lang files
David Monllao [Fri, 12 Apr 2013 04:14:13 +0000 (12:14 +0800)]
MDL-38089 mod_wiki: Fix incorrect links
Damyon Wiese [Fri, 12 Apr 2013 03:52:34 +0000 (11:52 +0800)]
MDL-29877 Grades - Remove hardcoded prefix from upgrade step.
Damyon Wiese [Fri, 12 Apr 2013 03:38:37 +0000 (11:38 +0800)]
MDL-29877 Grades - version bump for upgrade step.
And whitespace...
Damyon Wiese [Fri, 12 Apr 2013 03:37:48 +0000 (11:37 +0800)]
Merge branch 'MDL-29877_bad_grade_item_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
Conflicts:
version.php
Jayesh Anandani [Wed, 10 Apr 2013 19:44:32 +0000 (01:14 +0530)]
MDL-39054 quiz statistics: move hard-coded text to lang file
Dan Poltawski [Fri, 12 Apr 2013 02:26:57 +0000 (10:26 +0800)]
Merge branch 'MDL-37537-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE
Jean-Michel Vedrine [Thu, 4 Apr 2013 16:32:59 +0000 (18:32 +0200)]
MDL-38880 Imported Cloze questions lose embedded images or other media
Jean-Philippe Gaudreau [Thu, 11 Apr 2013 14:52:56 +0000 (10:52 -0400)]
MDL-38637 CAS Authentication: Undefined index: QUERY_STRING when executing cron
Aaron Barnes [Sat, 6 Apr 2013 10:33:19 +0000 (23:33 +1300)]
MDL-37537 completion: Fix incorrect lang string reference in block
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 10:41:17 +0000 (12:41 +0200)]
weekly release 2.3.6+
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 10:33:06 +0000 (12:33 +0200)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
Kordan [Thu, 11 Apr 2013 09:03:10 +0000 (11:03 +0200)]
MDL-39080 theme_formal_white: modified "Main menu" block look to resemble the "Navigation" one
Dan Poltawski [Thu, 11 Apr 2013 08:53:33 +0000 (16:53 +0800)]
Revert "MDL-38254 Assignment Module: add avaialble message to all assignment types"
This reverts commit
079a76bb37b915d7dbeb9e233dd9a60745f13105.
Damyon Wiese [Thu, 11 Apr 2013 06:07:46 +0000 (14:07 +0800)]
MDL-35144 Categories - Allow editing by custom roles
Users with category:manage or course:create should be able to edit
the course/category.php page.
Eloy Lafuente (stronk7) [Wed, 10 Apr 2013 22:57:23 +0000 (00:57 +0200)]
Merge branch 'MDL-38525-23' of https://github.com/damyon/moodle into MOODLE_23_STABLE
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).
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.
Dan Poltawski [Wed, 10 Apr 2013 06:11:03 +0000 (14:11 +0800)]
Merge branch 'MDL-19072_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Howard Miller [Mon, 8 Apr 2013 14:47:03 +0000 (15:47 +0100)]
MDL-35144 adding editing capabiltities to page
Dan Poltawski [Wed, 10 Apr 2013 04:16:58 +0000 (12:16 +0800)]
Merge branch 'wip-mdl-35883-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
Dan Poltawski [Wed, 10 Apr 2013 04:13:51 +0000 (12:13 +0800)]
Merge branch 'MDL-38254_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Dan Poltawski [Wed, 10 Apr 2013 02:36:00 +0000 (10:36 +0800)]
Merge branch 'MDL-38999_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
Andrew Davis [Wed, 10 Apr 2013 00:34:04 +0000 (08:34 +0800)]
MDL-29877 core_grade:add some upgrade code to fix broken grade items introduced by bad restores
Petr Škoda [Tue, 9 Apr 2013 21:48:59 +0000 (23:48 +0200)]
MDL-38912 fix incorrect timeout reset
sam marshall [Tue, 9 Apr 2013 16:35:39 +0000 (17:35 +0100)]
MDL-39000 Conditional activities: Section condition restore errors
Jean-Michel Vedrine [Tue, 9 Apr 2013 09:11:08 +0000 (11:11 +0200)]
MDL-19072 XHTML export for match questions fix for distractors
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
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
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
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.
AMOS bot [Tue, 9 Apr 2013 00:37:52 +0000 (00:37 +0000)]
Automatically generated installer lang files
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
Petr Škoda [Mon, 8 Apr 2013 11:17:56 +0000 (13:17 +0200)]
MDL-39028 fix sqlsrv concat type conversion
Sam Hemelryk [Tue, 9 Apr 2013 00:06:26 +0000 (12:06 +1200)]
MDL-38442 navigation: set_expansion_limit now only hides structural nodes
Petr Škoda [Mon, 8 Apr 2013 08:36:37 +0000 (10:36 +0200)]
MDL-39024 fix MSSQL seek past the end of recordset
Petr Škoda [Mon, 8 Apr 2013 08:19:51 +0000 (10:19 +0200)]
MDL-39022 fix MSSQL concat type conversion
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
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
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 14:09:41 +0000 (16:09 +0200)]
MDL-38999 timezones: add some TZ/stamps know to be problematic to tests.
Eloy Lafuente (stronk7) [Sun, 7 Apr 2013 23:04:42 +0000 (01:04 +0200)]
MDL-38999 timezones: fixed timezone information.
sam marshall [Mon, 8 Apr 2013 13:53:38 +0000 (14:53 +0100)]
MDL-38824 Activity completion: Automatic completion quotes not escaped
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.
Petr Škoda [Mon, 8 Apr 2013 07:23:45 +0000 (09:23 +0200)]
MDL-38753 tweak count SQL to make stupid Oracle happy
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
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
Tim Lock [Thu, 28 Mar 2013 00:45:23 +0000 (11:15 +1030)]
MDL-35868: quiz: Use correct attemptnumber when a last attempt exists.
AMOS bot [Mon, 8 Apr 2013 00:36:07 +0000 (00:36 +0000)]
Automatically generated installer lang files
AMOS bot [Sun, 7 Apr 2013 00:37:27 +0000 (00:37 +0000)]
Automatically generated installer lang files
Tim Hunt [Thu, 4 Apr 2013 13:51:25 +0000 (14:51 +0100)]
MDL-38912 prevent time-outs during unit tests.
Dan Poltawski [Fri, 5 Apr 2013 10:00:37 +0000 (18:00 +0800)]
weekly release 2.3.6+
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
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>
Rossiani Wijaya [Thu, 4 Apr 2013 03:04:22 +0000 (11:04 +0800)]
MDL-38254 Assignment Module: add avaialble message to all assignment types
AMOS bot [Thu, 4 Apr 2013 00:36:11 +0000 (00:36 +0000)]
Automatically generated installer lang files
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
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
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
AMOS bot [Wed, 3 Apr 2013 00:35:47 +0000 (00:35 +0000)]
Automatically generated installer lang files
Rajesh Taneja [Tue, 2 Apr 2013 08:07:15 +0000 (16:07 +0800)]
MDL-35883 Accessibility: Added title for login as user link in header and footer for accessibility
Rajesh Taneja [Tue, 2 Apr 2013 07:32:38 +0000 (15:32 +0800)]
MDL-35883 Accessibility: Added title for user link in header and footer for accessibility
Conflicts:
lib/outputrenderers.php
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
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
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
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
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
