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
Damyon Wiese [Thu, 28 Mar 2013 06:47:18 +0000 (14:47 +0800)]
weekly release 2.3.6+
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
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
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
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
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.
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
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 14:37:36 +0000 (15:37 +0100)]
MDL-38659 environment: fix incorrect feedback messages
Damyon Wiese [Tue, 26 Mar 2013 07:29:00 +0000 (15:29 +0800)]
MDL-38468 Filelib: Fix ordering of new mimetypes and upgrade step
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
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
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
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
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
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
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
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.
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
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
Damyon Wiese [Mon, 25 Mar 2013 01:38:30 +0000 (09:38 +0800)]
MDL-37033 Environment - Fix indenting in XML
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
Andrew Robert Nicols [Fri, 22 Mar 2013 17:29:56 +0000 (17:29 +0000)]
MDL-38658 JavaScript: Correct fullpath for dndupload definition
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
Eloy Lafuente (stronk7) [Sun, 24 Mar 2013 09:46:33 +0000 (10:46 +0100)]
MDL-38668 timezones: update to tzdata 2013b
Eloy Lafuente (stronk7) [Fri, 22 Mar 2013 15:08:07 +0000 (16:08 +0100)]
MDL-37033 environment: add 2.5 brach details
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='.
Tim Hunt [Tue, 19 Mar 2013 17:51:41 +0000 (17:51 +0000)]
MDL-38557 quiz manual grading should check mod/quiz:grade
Damyon Wiese [Fri, 22 Mar 2013 05:43:28 +0000 (13:43 +0800)]
weekly release 2.3.6+
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
Rajesh Taneja [Fri, 22 Mar 2013 04:39:24 +0000 (12:39 +0800)]
MDL-36125 course: Added aria-describedby for editing activity title
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
Frederic Massart [Thu, 21 Mar 2013 09:46:28 +0000 (17:46 +0800)]
MDL-37664 blocks: Unexisting function for RTL in drag & drop
AMOS bot [Thu, 21 Mar 2013 00:37:32 +0000 (00:37 +0000)]
Automatically generated installer lang files
David Monllao [Wed, 20 Mar 2013 07:45:00 +0000 (15:45 +0800)]
MDL-38364 phpunit: PHPUnit autoload uses capital A
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
Damyon Wiese [Wed, 20 Mar 2013 04:41:39 +0000 (12:41 +0800)]
MDL-38373 Auth - Additional strict warning fix for radius authentication
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
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.
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
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
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
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
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
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
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
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
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
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
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
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
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
Petr Škoda [Sun, 17 Mar 2013 19:51:25 +0000 (20:51 +0100)]
MDL-38202 fix loginas logout redirection
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
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
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.
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
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
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
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 08:37:31 +0000 (09:37 +0100)]
Merge branch 'MDL-36872-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
Damyon Wiese [Mon, 18 Mar 2013 03:46:15 +0000 (11:46 +0800)]
Merge branch 'MDL-38215-workshop-oracle_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE
Petr Škoda [Sun, 17 Mar 2013 19:59:11 +0000 (20:59 +0100)]
MDL-38329 use proper plugin name for the webkit lists workaround
Credit goes to Mauno Korpelainen, thanks.
Petr Škoda [Sun, 17 Mar 2013 18:54:55 +0000 (19:54 +0100)]
MDL-38364 rework PHPUnit autoloading
This is related to BC incompatibility introduced in https://github.com/sebastianbergmann/phpunit/issues/848
Andrew Robert Nicols [Sat, 16 Mar 2013 20:45:02 +0000 (20:45 +0000)]
MDL-38515 JavaScript: Correct module dependencies for core_filepicker
ppichet [Wed, 13 Mar 2013 02:36:48 +0000 (22:36 -0400)]
MDL-38444 Saving datasets from edit_calculatedsimple_form.php
Bypassing the 3 steps savequestion() of calculated.
Eloy Lafuente (stronk7) [Sat, 16 Mar 2013 17:04:57 +0000 (18:04 +0100)]
MDL-25655 glossary: non full searches now working.
In the process of updting the module from 1.9 to
2.0 the (non) full search feature was lost without notice.
This restitutes it with the same behavior present in 1.9:
- fullsearch disabled: look into concepts and aliases.
- fullsearch enabled (default): look also into definitions.
Eloy Lafuente (stronk7) [Thu, 7 Mar 2013 14:38:40 +0000 (15:38 +0100)]
MDL-38373 Use correct PEAR->loadExtension()
Current use is wrong (static) and leads to strict standards notice.
Mary Evans [Sat, 16 Mar 2013 01:50:52 +0000 (01:50 +0000)]
MDL-38380 theme_magazine: Fixed typo in style/core.css.
Tim Hunt [Fri, 15 Mar 2013 11:58:06 +0000 (11:58 +0000)]
MDL-38412 fix quiz reports group mode weirdness.
Moodle currently selected group uses the session. This can cause weird
effects when you have two tabs open. This is particularly weird in the
quiz reports, where some actions like delete attempt are checked against
the currently selected group.
The solution is to put the currently selected group into the URL for all
actions like delete/regrade attempt, regrade all attempts, download and
sort table.
Tim Hunt [Fri, 15 Mar 2013 11:22:38 +0000 (11:22 +0000)]
MDL-38363 qtype_calculated. Fix warnings.
Eloy Lafuente (stronk7) [Fri, 15 Mar 2013 11:01:22 +0000 (12:01 +0100)]
Moodle release 2.3.6
Eloy Lafuente (stronk7) [Fri, 15 Mar 2013 08:49:34 +0000 (09:49 +0100)]
weekly release 2.3.5+
Tim Hunt [Fri, 15 Mar 2013 08:12:39 +0000 (08:12 +0000)]
MDL-38395 question categories: wrong URLs after editing.
The problem was that array1 + array2 takes the values from
array1 when a key appears in both places.
While working on this area, I updated it to use html_writer.
Damyon Wiese [Fri, 15 Mar 2013 05:04:33 +0000 (13:04 +0800)]
Merge branch 'MDL-38474-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Frederic Massart [Fri, 15 Mar 2013 05:01:29 +0000 (13:01 +0800)]
MDL-38474 repository: Undefined variable
Damyon Wiese [Fri, 15 Mar 2013 02:56:18 +0000 (10:56 +0800)]
Merge branch 'MDL-38474-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Frederic Massart [Thu, 14 Mar 2013 06:09:19 +0000 (14:09 +0800)]
MDL-38474 repository: Correct context when checking permissions to access a repository
Jonathon Fowler [Thu, 17 Jan 2013 02:19:44 +0000 (12:19 +1000)]
MDL-38388 qformat_blackboard_six: fix question image import
This works on the expectation that the returned array from readdata()
is opaque and will be fed directly into readquestions() since
filebase is different per file and needs to be set up appropriately
before each parse.
Tim Hunt [Thu, 14 Mar 2013 22:24:37 +0000 (22:24 +0000)]
MDL-38355 qtype_multianswer: input boxes too big in Russian.
... and any other language where the characters take multiple
bytes in UTF-8.
This fix was worked out by Dušan Ristić. I am just committing it.
Tim Hunt [Thu, 14 Mar 2013 22:11:49 +0000 (22:11 +0000)]
MDL-38397 question editing: only validate default mark if present.
Most qtypes have that field, but not all. multianswer is an example in core.
Also some contrib qtypes.
Tim Hunt [Thu, 14 Mar 2013 17:21:16 +0000 (17:21 +0000)]
MDL-38490 question preview, variant is attempt (not display) option
Eloy Lafuente (stronk7) [Thu, 14 Mar 2013 14:46:58 +0000 (15:46 +0100)]
weekly release 2.3.5+
Ankit Agarwal [Tue, 12 Mar 2013 09:04:53 +0000 (17:04 +0800)]
MDL-36872 reports: Fixing incorrect sorting of recent activites by timestamp
Aparup Banerjee [Thu, 14 Mar 2013 03:05:43 +0000 (11:05 +0800)]
Merge branch 'MDL-38356-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE
Aparup Banerjee [Thu, 14 Mar 2013 03:05:11 +0000 (11:05 +0800)]
Revert "Merge branch 'MDL-38356-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE"
This reverts commit
771053bd830410b435fe102b20fd4ccabbd4dd4a, reversing
changes made to
c2fb582ef5491b59e59b37df692cc2c8069fdda5.
Mary Evans [Thu, 14 Mar 2013 01:27:19 +0000 (01:27 +0000)]
MDL-38460 theme_mymobile: Fixes resources folders to show properly on first access.
Eloy Lafuente (stronk7) [Wed, 13 Mar 2013 23:29:03 +0000 (00:29 +0100)]
Revert "Merge branch 'MDL-34818_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE"
This reverts commit
4f558e2741cd8f64fd75e5dadf02cb351cfd130b, reversing
changes made to
97846ce94c7f3bb74c63f83818c8311daea264ff.
Andrew Robert Nicols [Wed, 13 Mar 2013 18:15:16 +0000 (18:15 +0000)]
MDL-38356 JavaScript: Correct the test for currentform
Brent Boghosian [Wed, 6 Mar 2013 16:43:43 +0000 (16:43 +0000)]
MDL-38356 Forms: Check that the form exists before applying changechecker
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
David Mudrák [Wed, 13 Mar 2013 14:17:42 +0000 (15:17 +0100)]
MDL-38215 Fix cross-db support in workshop SQL queries
The $sql used in these methods may contain multiple parts glued
together by the UNION operator. Simply appending the ORDER BY statement
to the end of the query does not work in all DBs (failure reported at
Oracle). Following the pattern already applied in MDL-30051, we wrap the
SQL into yet another SELECT statement and perform ordering there.
Credit goes to Sara Cenni for suggesting the fix.
Eloy Lafuente (stronk7) [Wed, 13 Mar 2013 00:14:59 +0000 (01:14 +0100)]
Merge branch 'MDL-38268-m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Wed, 13 Mar 2013 00:09:59 +0000 (01:09 +0100)]
Merge branch 'MDL-30166-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 12 Mar 2013 21:58:12 +0000 (22:58 +0100)]
Merge branch 'wip-mdl-38332-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
Shamim Rezaie [Thu, 31 Jan 2013 10:45:50 +0000 (10:45 +0000)]
MDL-37664 course: Fix drag & drop RTL mode issue
Kordan [Tue, 12 Mar 2013 12:50:24 +0000 (13:50 +0100)]
MDL-38424 theme_formal_white: added suggestions to css custom styles description
Damyon Wiese [Tue, 12 Mar 2013 08:05:42 +0000 (16:05 +0800)]
Merge branch 'MDL-34011_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Aparup Banerjee [Tue, 12 Mar 2013 07:50:55 +0000 (15:50 +0800)]
Merge branch 'MDL-35615_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Rossiani Wijaya [Tue, 12 Mar 2013 06:16:15 +0000 (14:16 +0800)]
MDL-34011 Lesson module - short answer question: fixed student attempt statistics
Damyon Wiese [Tue, 12 Mar 2013 06:08:05 +0000 (14:08 +0800)]
MDL-34011 Lesson module: fixed incorrect display of student attempt for short answer question
Aparup Banerjee [Tue, 12 Mar 2013 05:38:10 +0000 (13:38 +0800)]
Merge branch 'MDL-38356-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE