Eloy Lafuente (stronk7) [Mon, 1 Jul 2013 22:47:00 +0000 (00:47 +0200)]
Merge branch 'get_users_by_capability_fix_m23' of github.com/timgus/moodle into MOODLE_23_STABLE
Rossiani Wijaya [Tue, 28 May 2013 04:31:18 +0000 (12:31 +0800)]
MDL-39546 Lesson module: removed duplicate to decode special characters
Rossiani Wijaya [Mon, 27 May 2013 08:26:09 +0000 (16:26 +0800)]
MDL-39546 Lesson module: fixed matching question issues
Eloy Lafuente (stronk7) [Mon, 1 Jul 2013 21:14:26 +0000 (23:14 +0200)]
Merge branch 'w27_MDL-39754_m23_evn26' of https://github.com/skodak/moodle into MOODLE_23_STABLE
Petr Škoda [Mon, 1 Jul 2013 07:44:02 +0000 (09:44 +0200)]
MDL-39754 copy 2.5 requirements to Moodle 2.6
Optional features and warnings may be added later,
but we need at least required environment for 2.5.1
This includes database family cleanup and more realistic memory requirement.
Mark Nielsen [Mon, 1 Jul 2013 03:26:48 +0000 (11:26 +0800)]
MDL-40308: Privacy settings do not change
Update LTI mod form so checkboxes always submit their value.
Sam Hemelryk [Wed, 26 Jun 2013 22:05:35 +0000 (10:05 +1200)]
MDL-40344 navigation: expandable branch id is now properly unique
Eloy Lafuente (stronk7) [Thu, 27 Jun 2013 18:11:07 +0000 (20:11 +0200)]
weekly release 2.3.7+
Eloy Lafuente (stronk7) [Thu, 27 Jun 2013 18:05:44 +0000 (20:05 +0200)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
AMOS bot [Thu, 27 Jun 2013 00:40:27 +0000 (00:40 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Mon, 24 Jun 2013 19:22:06 +0000 (21:22 +0200)]
Merge branch 'MDL-40264-m23-essay-zero' of git://github.com/ktemkin/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 24 Jun 2013 18:21:55 +0000 (20:21 +0200)]
Merge branch 'MDL-34610_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 24 Jun 2013 17:26:49 +0000 (19:26 +0200)]
Merge branch 'MDL-40255_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Matteo Scaramuccia [Sat, 15 Jun 2013 10:17:54 +0000 (12:17 +0200)]
MDL-40200 Administration: Return the invalid user message and stop there
To avoid adding duplicate code, 'invalid user' and 'user deleted' checks
have been merged together.
Conflicts:
user/profile.php
Sam Chaffee [Thu, 20 Jun 2013 19:54:03 +0000 (15:54 -0400)]
MDL-40258: Fixed invalid json string error in file-picker
Ankit Agarwal [Fri, 21 Jun 2013 02:47:38 +0000 (10:47 +0800)]
MDL-40250 phpunit: Add unit tests for core_files_external::upload()
Sam Hemelryk [Mon, 24 Jun 2013 02:25:54 +0000 (14:25 +1200)]
Merge branch 'MDL-39760-MOODLE_23_STABLE' of https://github.com/lucisgit/moodle into MOODLE_23_STABLE
Conflicts:
mod/assign/locallib.php
Sam Hemelryk [Sun, 23 Jun 2013 23:28:23 +0000 (11:28 +1200)]
MDL-38347 fixed whitespace
Sam Hemelryk [Sun, 23 Jun 2013 23:20:27 +0000 (11:20 +1200)]
Merge branch 'wip-MDL-38347-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 23 Jun 2013 22:28:46 +0000 (10:28 +1200)]
Merge branch 'MDL-28124_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Mary Evans [Sat, 22 Jun 2013 19:34:44 +0000 (20:34 +0100)]
MDL-40255 theme_boxxie/theme_formfactor: Added block-region class to layout files to enable dnd file uploader to work.
Tim Hunt [Fri, 21 Jun 2013 12:28:30 +0000 (13:28 +0100)]
MDL-34610 remove legacy IE CSS. It breaks form layout
Kyle Temkin [Fri, 21 Jun 2013 07:28:59 +0000 (03:28 -0400)]
MDL-40264 fix essay handling of zero-string response
Fixes an inappropriate behavior of the is_complete_response() function
for the Essay question type, which caused the string "0" to be
inappropriately marked as an incomplete response.
Also adds a set of unit tests for the Essay question type's
is_complete_response.
Dan Poltawski [Fri, 21 Jun 2013 05:27:50 +0000 (13:27 +0800)]
weekly release 2.3.7+
Tim Gus [Mon, 10 Jun 2013 13:13:37 +0000 (09:13 -0400)]
MDL-40259 - For SCORM reports limit fields returned from
get_users_by_capability to user ID to decrease memory utilization
Ruslan Kabalin [Mon, 20 May 2013 13:08:34 +0000 (14:08 +0100)]
MDL-39760: mod_assign: Add few more callback methods.
Adds lock, unlock and release_to_draft. All of them accept single parameter -
an assign_submission record.
Ruslan Kabalin [Fri, 17 May 2013 14:47:50 +0000 (15:47 +0100)]
MDL-39760: mod_assign: Make submit_for_grading accept submission as parameter
Marina Glancy [Tue, 18 Jun 2013 05:41:36 +0000 (15:41 +1000)]
Merge branch 'MDL-40207-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Marina Glancy [Tue, 18 Jun 2013 04:11:54 +0000 (14:11 +1000)]
Merge branch 'MDL-39650-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Ruslan Kabalin [Mon, 17 Jun 2013 09:19:45 +0000 (10:19 +0100)]
MDL-33546: course: Fix current week hightlighting after dragging the section
Marina Glancy [Tue, 18 Jun 2013 02:54:40 +0000 (12:54 +1000)]
Merge branch 'MDL-40165-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE
Marina Glancy [Tue, 18 Jun 2013 01:15:54 +0000 (11:15 +1000)]
Merge branch 'MDL-38079_23' of git://github.com/mr-russ/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 17 Jun 2013 22:48:50 +0000 (00:48 +0200)]
Merge branch 'MDL-33562-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Conflicts:
version.php
Sam Hemelryk [Mon, 17 Jun 2013 22:26:10 +0000 (10:26 +1200)]
Merge branch 'MDL-30132_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 17 Jun 2013 21:03:54 +0000 (09:03 +1200)]
Merge branch 'wip-MDL-40159-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
Russell Smith [Mon, 17 Jun 2013 09:50:13 +0000 (19:50 +1000)]
MDL-38079 mod_feedback - Hide "add question to activity" button
Marina Glancy [Mon, 17 Jun 2013 04:26:10 +0000 (14:26 +1000)]
MDL-40159 Fixing bug with empty variable, regression from MDL-21097
Sam Hemelryk [Mon, 17 Jun 2013 04:09:36 +0000 (16:09 +1200)]
Merge branch 'm23_MDL-40095_Completion_locked_Error_on_save' of https://github.com/scara/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 17 Jun 2013 03:44:58 +0000 (15:44 +1200)]
Merge branch 'MDL-21933_23' of https://github.com/mr-russ/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 17 Jun 2013 03:42:55 +0000 (15:42 +1200)]
Merge branch 'wip-MDL-40091-MOODLE_23_STABLE' of git://github.com/satrun77/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 17 Jun 2013 02:46:53 +0000 (10:46 +0800)]
MDL-40207 simplepie: reduce false failures in unit tests
The simplepie tests time out too quickly due to a low connect timeout,
to fix this, I converted the unit tests to use a high timeout value.
Sam Hemelryk [Mon, 17 Jun 2013 02:24:37 +0000 (14:24 +1200)]
Merge branch 'MDL-39761-MOODLE_23_STABLE' of https://github.com/lucisgit/moodle into MOODLE_23_STABLE
Sam Hemelryk [Wed, 12 Jun 2013 04:23:13 +0000 (16:23 +1200)]
MDL-40142 navigation: fixed chainable issue with navigation JS
Mary Evans [Fri, 14 Jun 2013 21:42:57 +0000 (22:42 +0100)]
MDL-28124 admin/tool/customlang: Changed page layout from 'standard' to 'report'.
Mohamed Alsharaf [Tue, 11 Jun 2013 23:54:42 +0000 (11:54 +1200)]
MDL-40091 book: revision must be incremented after editing a chapter
Marina Glancy [Fri, 14 Jun 2013 03:34:42 +0000 (13:34 +1000)]
weekly release 2.3.7+
Andrew Nicols [Wed, 12 Jun 2013 19:40:50 +0000 (20:40 +0100)]
MDL-40165 Backup: Split out test classes into multiple files
Dan Poltawski [Thu, 13 Jun 2013 05:58:00 +0000 (13:58 +0800)]
Dan Poltawski [Thu, 13 Jun 2013 05:57:58 +0000 (13:57 +0800)]
Revert "MDL-39832 Files: Fixed ETag format according with RFC2616."
This reverts commit
bf4a95e6a3a84b35b5a9efbe903c9c6f9523854a.
Russell Smith [Thu, 13 Jun 2013 00:25:44 +0000 (10:25 +1000)]
MDL-21933 course: Allow users to search participants course permission
Capability checks are performed at the top of the page and do not need
to be completed again.
Search is an expected feature for users and it was confusion to only
appear after 3 pages. This has been changed to enable search when
there are more records than are visible on the screen. If users
are unable to use browser search, they will be able to use Moodle's
search.
Mary Evans [Wed, 12 Jun 2013 12:29:45 +0000 (13:29 +0100)]
MDL-30312 User: Changed page layout from mydashboard to mypublic in user/profile.php
Sam Hemelryk [Tue, 11 Jun 2013 20:59:32 +0000 (08:59 +1200)]
Merge branch 'MDL-25901-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 11 Jun 2013 05:30:58 +0000 (17:30 +1200)]
Merge branch 'MDL-26925-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 11 Jun 2013 05:15:47 +0000 (17:15 +1200)]
Merge branch 'MDL-39505-migrate-file-backport_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 11 Jun 2013 05:08:21 +0000 (17:08 +1200)]
Merge branch 'MDL-22390_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 11 Jun 2013 04:54:59 +0000 (12:54 +0800)]
Merge branch 'm23_MDL-40002_ETag_value_must_be_a_quoted-string' of https://github.com/scara/moodle into MOODLE_23_STABLE
Marina Glancy [Tue, 11 Jun 2013 02:12:36 +0000 (12:12 +1000)]
Merge branch 'MDL-39412_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Matteo Scaramuccia [Sun, 9 Jun 2013 14:04:45 +0000 (16:04 +0200)]
MDL-40095 SCORM: Trivial comments tidy up
Matteo Scaramuccia [Sun, 9 Jun 2013 13:21:35 +0000 (15:21 +0200)]
MDL-40095 SCORM: Fixed DML error when saving with completion options locked
Regression caused by MDL-38315.
Dan Poltawski [Mon, 10 Jun 2013 08:20:56 +0000 (16:20 +0800)]
Merge branch 'MDL-39947_23' of https://github.com/aolley/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 10 Jun 2013 07:43:25 +0000 (15:43 +0800)]
Merge branch 'm23_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile' of https://github.com/scara/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 10 Jun 2013 07:00:39 +0000 (15:00 +0800)]
Merge branch 'MDL-40018_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
David Mudrák [Thu, 6 Jun 2013 10:44:13 +0000 (12:44 +0200)]
MDL-40080 Remove unused strings from the core_hub subsystem
Dan Poltawski [Mon, 10 Jun 2013 04:51:51 +0000 (12:51 +0800)]
Merge branch 'MDL-39667-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 10 Jun 2013 03:54:34 +0000 (15:54 +1200)]
Merge branch 'MDL-40009_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 10 Jun 2013 03:47:38 +0000 (15:47 +1200)]
Merge branch 'w24_MDL-39549_m23_cohortsearch' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 10 Jun 2013 03:09:22 +0000 (15:09 +1200)]
Merge branch 'MDL-39971_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 10 Jun 2013 02:39:54 +0000 (14:39 +1200)]
Merge branch 'w24_MDL-32480_m23_imscp' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 10 Jun 2013 00:30:24 +0000 (12:30 +1200)]
Merge branch 'MDL-36090_log2_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
Matteo Scaramuccia [Sun, 9 Jun 2013 07:43:36 +0000 (09:43 +0200)]
MDL-40002 Files: ETag value must be a quoted-string.
ETag value must be double quoted, http://tools.ietf.org/html/rfc2616#section-3.11.
More details about potential impacts in MDL-39832: shortly, at least when using
HTTP Partial GET Requests (HTTP Status: 206) plus X-Sendfile HTTP Header.
In this commit, the impact is to be RFC2616 compliant when using the ETag Header.
Tim Hunt [Fri, 26 Apr 2013 16:51:23 +0000 (17:51 +0100)]
MDL-22390 autolink filter: handle URLs in brackets better.
This breaks some legitimate URLs like
http://en.wikipedia.org/wiki/Slash_(punctuation).
This is a necessary trade-off. Many other web systems do not handle that
case correctly either. The work-around it so escape the ) as %29.
This commit also improves the way the unit tests for this work.
It also fixes a couple of other tricky cases that were spotted in
the forums while this was being discussed. See the new test cases.
Petr Škoda [Fri, 7 Jun 2013 20:07:15 +0000 (22:07 +0200)]
MDL-39549 fix cohort search in course categories
Petr Škoda [Wed, 30 Jan 2013 19:28:06 +0000 (20:28 +0100)]
MDL-37780 fix 1.9 restore on windows
Petr Škoda [Mon, 3 Jun 2013 09:18:02 +0000 (11:18 +0200)]
MDL-32480 allow external https links in IMSCP too
Nicolas Dunand [Mon, 3 Jun 2013 06:13:19 +0000 (08:13 +0200)]
MDL-32480 fix display of IMS content packages with external links
Matteo Scaramuccia [Sat, 1 Jun 2013 10:34:40 +0000 (12:34 +0200)]
MDL-39832 Files: Fixed ETag format according with RFC2616.
ETag must be double quoted,
http://tools.ietf.org/html/rfc2616#section-3.11:
entity-tag = [ weak ] opaque-tag
weak = "W/"
opaque-tag = quoted-string
Matteo Scaramuccia [Mon, 3 Jun 2013 19:41:21 +0000 (21:41 +0200)]
MDL-39832 Files: Revert MDL-39688 commit,
6ce0c9ce42fa7849e67d7611a628ece51c336c5f
MDL-39688 has been successful in providing a solution for the issue but further
investigations done in MDL-39832 have got the evidence that the given solution
is more likely a workaround.
Dan Poltawski [Thu, 6 Jun 2013 06:07:27 +0000 (14:07 +0800)]
MDL-26925 User selector: Set label when no results
Thanks to Jonathon Fowler for the fix!
Dan Poltawski [Thu, 6 Jun 2013 04:00:05 +0000 (12:00 +0800)]
weekly release 2.3.7+
Dan Poltawski [Thu, 6 Jun 2013 03:55:56 +0000 (11:55 +0800)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
Dan Poltawski [Thu, 6 Jun 2013 03:21:19 +0000 (11:21 +0800)]
MDL-25901 rss: do not copyright html tag
They copyright field does not permit html, it should be plain text
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 08:45:19 +0000 (10:45 +0200)]
Merge branch 'wip-MDL-21097-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
Conflicts:
index.php
Marina Glancy [Wed, 5 Jun 2013 08:06:56 +0000 (18:06 +1000)]
MDL-21097 Correctly check capabilities for frontpage editing mode
Marina Glancy [Wed, 5 Jun 2013 04:00:11 +0000 (14:00 +1000)]
MDL-21097 corrected course editing roles
Marina Glancy [Thu, 30 May 2013 00:28:35 +0000 (10:28 +1000)]
MDL-21097 Correctly check capabilities for course settings items
- Make sure that items in course settings (and frontpage settings) are shown depending on user capabilities
- Make sure user is able to turn editing on on the page even if he has only limited number of seciton/modules capabilities
Dan Poltawski [Wed, 5 Jun 2013 05:11:58 +0000 (13:11 +0800)]
Merge branch 'wip-MDL-21097-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
Marina Glancy [Wed, 5 Jun 2013 04:00:11 +0000 (14:00 +1000)]
MDL-21097 corrected course editing roles
Andrew Davis [Mon, 28 Jan 2013 04:03:59 +0000 (12:03 +0800)]
MDL-36090 core_grade: added logging of overriding of student grades
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:44:11 +0000 (02:44 +0200)]
Merge branch 'w23_MDL-39416_m23_pagelog' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:31:10 +0000 (02:31 +0200)]
Merge branch 'MDL-38731-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:27:49 +0000 (02:27 +0200)]
Merge branch 'MDL-37332-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 4 Jun 2013 23:43:34 +0000 (01:43 +0200)]
Merge branch 'wip-MDL-21097-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
Mary Evans [Tue, 4 Jun 2013 22:36:38 +0000 (23:36 +0100)]
MDL-40018 theme_sky_high: Fixed footer in admin pages.
Mark Nelson [Tue, 4 Jun 2013 09:59:24 +0000 (17:59 +0800)]
MDL-40009 notes: corrected the form element names passed to setType
Tim Hunt [Thu, 30 May 2013 18:18:36 +0000 (19:18 +0100)]
MDL-39945 qtype multichoice was not comparing blank responses correctly.
Mary Evans [Sat, 1 Jun 2013 20:36:58 +0000 (21:36 +0100)]
MDL-39835 theme_sky_high: Fix for footer to display correctly in higher resolutions.
Dan Poltawski [Tue, 4 Jun 2013 05:25:38 +0000 (13:25 +0800)]
Merge branch 'MDL-39536-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Frederic Massart [Fri, 31 May 2013 08:11:17 +0000 (16:11 +0800)]
MDL-39536 completion: Unit tests for get_activities and has_activities
Frederic Massart [Fri, 31 May 2013 06:25:21 +0000 (14:25 +0800)]
MDL-39536 completion: Prevent DB call when fetching activities
David Mudrák [Thu, 30 May 2013 20:42:12 +0000 (22:42 +0200)]
MDL-39939 Fix the basic SCORM report plugin name