Aparup Banerjee [Tue, 5 Mar 2013 04:56:40 +0000 (12:56 +0800)]
Merge branch 'MDL-30481_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Damyon Wiese [Tue, 5 Mar 2013 03:40:02 +0000 (11:40 +0800)]
Merge branch 'wip-MDL-38055-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
Frederic Massart [Mon, 11 Feb 2013 07:20:11 +0000 (15:20 +0800)]
MDL-34284 library: Import ZF2012-01 security patch for Zend
Sam Hemelryk [Tue, 5 Mar 2013 02:23:09 +0000 (15:23 +1300)]
Merge branch 'wip-MDL-37901_M23' of git://github.com/gjb2048/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 00:28:15 +0000 (01:28 +0100)]
Merge branch 'wip-MDL-36215-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 4 Mar 2013 20:29:35 +0000 (09:29 +1300)]
Merge branch 'MDL-38101-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 19:47:15 +0000 (20:47 +0100)]
Merge branch 'MDL-37522-published-attachment_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 19:17:12 +0000 (20:17 +0100)]
Merge branch 'wip-MDL-33013-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 17:00:15 +0000 (18:00 +0100)]
Merge branch 'MDL-36380-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 15:43:09 +0000 (16:43 +0100)]
Merge branch 'wip-MDL-37983-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 15:26:25 +0000 (16:26 +0100)]
Merge branch 'MDL-38170-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 4 Mar 2013 03:12:43 +0000 (16:12 +1300)]
Merge branch 'MDL-35350_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 4 Mar 2013 03:07:51 +0000 (16:07 +1300)]
Merge branch 'MDL-35127-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Frederic Massart [Mon, 4 Feb 2013 07:34:06 +0000 (15:34 +0800)]
MDL-36426 repository: Prevent login_as() users to access
Sam Hemelryk [Mon, 4 Mar 2013 01:18:19 +0000 (14:18 +1300)]
Merge branch 'MDL-37625-m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 4 Mar 2013 00:59:21 +0000 (13:59 +1300)]
Merge branch 'MDL-36128-moodle23' of https://github.com/StudiUM/moodle into MOODLE_23_STABLE
Frederic Massart [Mon, 4 Mar 2013 00:45:04 +0000 (13:45 +1300)]
MDL-37681 repository_webdav: improved form handling when configuring an instance
Sam Hemelryk [Mon, 4 Mar 2013 00:34:47 +0000 (13:34 +1300)]
Merge branch 'MDL-38168-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
Frederic Massart [Mon, 4 Mar 2013 00:27:46 +0000 (13:27 +1300)]
MDL-37507 repositories: improved formatting of external resources
Mark Nielsen [Sun, 3 Mar 2013 22:52:09 +0000 (23:52 +0100)]
MDL-36901: Remove system paths from exceptions
Replaces any server paths, like dataroot, with a token
in exception messages and debug info.
Conflicts:
lib/tests/setuplib_test.php
Frederic Massart [Sun, 3 Mar 2013 22:18:05 +0000 (11:18 +1300)]
MDL-37481 user: fixed bug when logged in as guest
Sam Hemelryk [Sun, 3 Mar 2013 21:30:24 +0000 (10:30 +1300)]
Merge branch 'MDL-32125-moodle23' of git://github.com/StudiUM/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 3 Mar 2013 20:48:45 +0000 (09:48 +1300)]
MDL-38055 course: fixed print_overview use of title attribute
Andrew Davis [Tue, 26 Feb 2013 03:07:19 +0000 (11:07 +0800)]
MDL-38149 core_grade: added a guard for when there are no old grades
Gareth J Barnard [Sat, 2 Mar 2013 13:05:12 +0000 (13:05 +0000)]
MDL-37901 format_topics & format_weeks: Fix drag icon tooltip after move.
sam marshall [Fri, 22 Feb 2013 17:23:01 +0000 (17:23 +0000)]
MDL-38170 SimplePie: Cannot read https feeds through proxy
Sam Hemelryk [Sun, 17 Feb 2013 21:54:53 +0000 (10:54 +1300)]
MDL-38055 navigation: fixed ampersand use within titles
Sam Hemelryk [Mon, 18 Feb 2013 21:46:51 +0000 (10:46 +1300)]
MDL-36215 navigation: fixed blog URL within courses using groups
Sam Hemelryk [Mon, 18 Feb 2013 22:38:43 +0000 (11:38 +1300)]
MDL-33013 navigation: fixed expansion limit issue hiding nodes
Jean-Philippe Gaudreau [Tue, 19 Feb 2013 16:36:44 +0000 (11:36 -0500)]
MDL-36128 grade: Import outcomes error
David Mudrák [Thu, 28 Feb 2013 15:36:01 +0000 (16:36 +0100)]
MDL-37522 Serve images from published submissions
If the user is allowed to see the published submission, she must be also
able to see images in it (both embedded into the text as well as
attached to the submission). See the logic in submission.php as a
reference.
Gilles-Philippe Leblanc [Wed, 6 Feb 2013 13:29:21 +0000 (08:29 -0500)]
MDL-32125 mod_forum: Updating subscription mode not reflecting subscribers
Eloy Lafuente (stronk7) [Thu, 28 Feb 2013 14:49:56 +0000 (15:49 +0100)]
weekly release 2.3.4+
Eloy Lafuente (stronk7) [Thu, 28 Feb 2013 14:40:45 +0000 (15:40 +0100)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
Michael de Raadt [Wed, 27 Feb 2013 06:44:21 +0000 (14:44 +0800)]
MDL-35350 Advanced uploading assignment: add submission timestamp on assignment index page
Frederic Massart [Thu, 28 Feb 2013 05:44:42 +0000 (13:44 +0800)]
MDL-36380 stats: Issue with DST and monthly statistics
Frederic Massart [Thu, 7 Feb 2013 03:11:05 +0000 (11:11 +0800)]
MDL-36380 stats: No more duplicated entries when viewing monthly stats
Damyon Wiese [Wed, 27 Feb 2013 01:50:40 +0000 (09:50 +0800)]
MDL-35127 Assignment - declare the variables in the outer scope (for readability)
Damyon Wiese [Wed, 27 Feb 2013 01:49:55 +0000 (09:49 +0800)]
Merge branch 'MDL-35127_m23' of git://github.com/merrill-oakland/moodle into MDL-35127-23
Eric Merrill [Tue, 26 Feb 2013 14:48:46 +0000 (09:48 -0500)]
MDL-35127 mod_assign More efficient use of expensive database queries
Moving two relatively expensive DB queries so they are only executed when needed
instead of on every function call. They will still only execute once, and not
repeatedly during execution of the loop.
Eloy Lafuente (stronk7) [Tue, 26 Feb 2013 11:43:42 +0000 (12:43 +0100)]
Merge branch 'wip_MDL-35641_m23_flowbackport' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Rossiani Wijaya [Tue, 26 Feb 2013 09:38:55 +0000 (17:38 +0800)]
MDL-30481 Advanced upload assignment: Fixed assignment available date string to appropriately identify past or future availability
Adrian Greeve [Thu, 3 Jan 2013 06:22:53 +0000 (14:22 +0800)]
MDL-30669 - blocks: Added a warning when deleting blocks that have multiple displays set.
Also added a fix to the function course_page_type_list(). It was making a call to
get_context_info_array() which will generate an error if $currentcontext is not set.
Sam Hemelryk [Tue, 26 Feb 2013 01:25:16 +0000 (14:25 +1300)]
Merge branch 'wip-MDL-38144-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
Marina Glancy [Thu, 21 Feb 2013 00:50:45 +0000 (11:50 +1100)]
MDL-38144 categories are created in reverse sort order in externallib
Damyon Wiese [Mon, 25 Feb 2013 05:56:45 +0000 (13:56 +0800)]
MDL-28692 Base theme - Version bump for css change
Damyon Wiese [Mon, 25 Feb 2013 05:36:31 +0000 (13:36 +0800)]
Merge branch 'MDL-28692_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 25 Feb 2013 03:00:19 +0000 (11:00 +0800)]
Merge branch 'wip-MDL-38091-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 25 Feb 2013 02:21:05 +0000 (10:21 +0800)]
Merge branch 'MDL-38061-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Damyon Wiese [Mon, 25 Feb 2013 01:53:46 +0000 (09:53 +0800)]
Merge branch 'MDL-35175_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE
AMOS bot [Mon, 25 Feb 2013 00:39:47 +0000 (00:39 +0000)]
Automatically generated installer lang files
Marina Glancy [Wed, 20 Feb 2013 01:52:33 +0000 (12:52 +1100)]
MDL-38091 fixed bug with SQL query on Oracle
sam marshall [Fri, 22 Feb 2013 14:15:01 +0000 (14:15 +0000)]
MDL-38168 Filelib: Curl class does not honour proxybypass option
Damyon Wiese [Fri, 22 Feb 2013 02:58:57 +0000 (10:58 +0800)]
weekly release 2.3.4+
Damyon Wiese [Fri, 22 Feb 2013 02:50:07 +0000 (10:50 +0800)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
Damyon Wiese [Fri, 22 Feb 2013 02:12:20 +0000 (10:12 +0800)]
MDL-38061 Assignment - Use $CFG->showuseridentity to add extra fields to the assignment grading table/user summary.
Conflicts:
mod/assign/gradingtable.php
mod/assign/locallib.php
mod/assign/renderable.php
mod/assign/renderer.php
Sam Hemelryk [Wed, 20 Feb 2013 19:23:58 +0000 (08:23 +1300)]
MDL-37224 backup-import: better handling of search button
Dan Poltawski [Wed, 20 Feb 2013 09:05:12 +0000 (17:05 +0800)]
Revert "MDL-36380 stats: No more duplicated entries when viewing monthly stats"
This reverts commit
e30af43f40d76ae11e8ce4979309aaad7cee6213.
Frederic Massart [Wed, 20 Feb 2013 04:23:18 +0000 (12:23 +0800)]
MDL-35622 files: Fixed typo in galleryitem extension
AMOS bot [Wed, 20 Feb 2013 00:45:27 +0000 (00:45 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 20 Feb 2013 00:36:20 +0000 (01:36 +0100)]
MDL-37894 Amend tests with new openclose rule.
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 23:49:04 +0000 (00:49 +0100)]
Merge branch 'wip-MDL-37224-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 23:46:29 +0000 (00:46 +0100)]
Merge branch 'wip-MDL-34298-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 23:40:32 +0000 (00:40 +0100)]
Merge branch 'MDL-37894_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 23:34:58 +0000 (00:34 +0100)]
Merge branch 'MDL-37967_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 23:08:03 +0000 (00:08 +0100)]
Merge branch 'wip-MDL-38075-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
sam marshall [Tue, 19 Feb 2013 16:54:13 +0000 (16:54 +0000)]
MDL-38101 Completion: Error when teacher/admin marks activity complete
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 12:21:18 +0000 (13:21 +0100)]
MDL-32620 whitespace + comment fixes.
Mark Nielsen [Wed, 13 Feb 2013 17:21:03 +0000 (09:21 -0800)]
MDL-32620: Fixing up white space in comment
Chris Scribner [Tue, 24 Apr 2012 14:48:47 +0000 (10:48 -0400)]
Fixing an issue with not sending the launch_presentation_return_url
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 11:24:41 +0000 (12:24 +0100)]
Merge branch 'MDL-38033_dnd_uppercase_extn_23' of git://github.com/davosmith/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 19 Feb 2013 06:07:33 +0000 (14:07 +0800)]
Merge branch 'w07_MDL-38059_m23_cachedir' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Sam Hemelryk [Wed, 13 Feb 2013 01:47:24 +0000 (14:47 +1300)]
MDL-38000 css: fixed handling of CSS files by outputlib.
Dan Poltawski [Tue, 19 Feb 2013 05:44:55 +0000 (13:44 +0800)]
Merge branch 'MDL-38048-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 19 Feb 2013 05:42:07 +0000 (13:42 +0800)]
Merge branch 'm23_MDL-37449_Reports_ORA-00918_column_ambiguously_defined' of https://github.com/scara/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 19 Feb 2013 04:26:03 +0000 (12:26 +0800)]
Merge branch 'MDL-37749_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 19 Feb 2013 03:23:56 +0000 (11:23 +0800)]
Merge branch 'MDL-38051_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 19 Feb 2013 02:56:47 +0000 (10:56 +0800)]
Merge branch 'MDL-37934_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
AMOS bot [Tue, 19 Feb 2013 00:44:36 +0000 (00:44 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Mon, 18 Feb 2013 22:03:33 +0000 (11:03 +1300)]
MDL-34298 course: fixed course search output validation issue
Sam Hemelryk [Mon, 18 Feb 2013 20:32:01 +0000 (09:32 +1300)]
MDL-37224 backup: fixed bug when searching for a course to import
Tim Hunt [Mon, 18 Feb 2013 10:27:37 +0000 (10:27 +0000)]
MDL-37894 Show the quiz close date even if the quiz is not open yet.
People care a lot about deadlines!
Dan Poltawski [Mon, 18 Feb 2013 08:00:07 +0000 (16:00 +0800)]
Merge branch 'MDL-38039_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Jean-Michel Vedrine [Thu, 14 Feb 2013 08:13:45 +0000 (09:13 +0100)]
MDL-37967 Improve XML question import format handling of duplicated files
Dan Poltawski [Mon, 18 Feb 2013 06:27:51 +0000 (14:27 +0800)]
Merge branch 'MDL-37396_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 18 Feb 2013 06:18:46 +0000 (14:18 +0800)]
Merge branch 'MDL-36380-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Rossiani Wijaya [Mon, 18 Feb 2013 05:41:13 +0000 (13:41 +0800)]
MDL-37396 Enrollmen: pass $perpage as optional_param and set default perpage variable in quickenrolment.js
Damyon Wiese [Mon, 18 Feb 2013 05:31:40 +0000 (13:31 +0800)]
Merge branch 'MDL-37939-m23' of https://github.com/andrewnicols/moodle into MOODLE_23_STABLE
Conflicts:
lib/db/upgrade.php
Dan Poltawski [Mon, 18 Feb 2013 04:24:23 +0000 (12:24 +0800)]
Merge branch 'MDL-35336_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Frederic Massart [Sat, 29 Sep 2012 06:33:49 +0000 (08:33 +0200)]
MDL-35622 files: Add support for SMART Notebook MIME types
- The MIME type for Notebook files is: application/x-smarttech-notebook
- The MIME type for Gallery files is also: application/x-smarttech-notebook
Refs: http://exchange-forum.smarttech.com/forums/p/5152/11945.aspx#11945
Original author: Matteo Scaramuccia <moodle@matteoscaramuccia.com>
Fixed by: Paul Holden <pholden@greenhead.ac.uk>
Conflicts:
lib/db/upgrade.php
version.php
Dan Poltawski [Mon, 18 Feb 2013 03:07:48 +0000 (11:07 +0800)]
Merge branch 'MDL-34800_ajax_submit_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
Rossiani Wijaya [Tue, 12 Feb 2013 09:12:03 +0000 (17:12 +0800)]
MDL-37396 User Enrollment: fixed missing user from enrolment sub-menu
Rossiani Wijaya [Wed, 13 Feb 2013 03:04:45 +0000 (11:04 +0800)]
MDL-35336 report (course overview): check the setting for enablestats before printing out the node for setting > site admin > reports
Rossiani Wijaya [Mon, 11 Feb 2013 05:15:58 +0000 (13:15 +0800)]
MDL-35336 Report (course overview): fixed redirect url to enable statistics setting page when statistics is disable
Mary Evans [Mon, 18 Feb 2013 01:54:23 +0000 (01:54 +0000)]
MDL-28692 theme_base: Added background-color to admin settings form overridden in base/style/admin.css
Adrian Greeve [Fri, 15 Feb 2013 07:38:04 +0000 (15:38 +0800)]
MDL-37983 - my home / navigation: $CFG->forcelogin is no longer affecting default home page redirects.
Sam Hemelryk [Sun, 17 Feb 2013 19:21:43 +0000 (08:21 +1300)]
MDL-38075 csslib: fixed coding error when working with an array of styles
Jean-Michel Vedrine [Fri, 15 Feb 2013 17:26:38 +0000 (18:26 +0100)]
MDL-38051 Annihilate all the CRLFs present in some questions/fixtures...
Petr Škoda [Sat, 16 Feb 2013 13:41:30 +0000 (14:41 +0100)]
MDL-38059 explain that cachedir must be shared in cluster
Matteo Scaramuccia [Fri, 15 Feb 2013 20:27:59 +0000 (21:27 +0100)]
MDL-37449 Incorrect doubled 'u.email' field in the SQL query (Oracle error: ORA-00918)
