Dan Poltawski [Mon, 15 Oct 2012 05:31:22 +0000 (13:31 +0800)]
Merge branch 'wip-MDL-35661-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Sun, 14 Oct 2012 22:20:33 +0000 (00:20 +0200)]
weekly release 2.3.2+
Eloy Lafuente (stronk7) [Sun, 14 Oct 2012 22:07:39 +0000 (00:07 +0200)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Sun, 14 Oct 2012 21:22:08 +0000 (23:22 +0200)]
Revert "MDL-31968 Make NTLM REMOTE_USER format configurable by the admin"
This reverts commit
af861e14dc5c83a5f4d142a0d13de1eb7467349b.
Note that MDL-31968 will be in charge of backporting this to stables
if everything goes well under master (once MDL-31968 is tested and closed)
Eloy Lafuente (stronk7) [Fri, 12 Oct 2012 00:18:03 +0000 (02:18 +0200)]
Merge branch 'MDL-35858-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Wed, 10 Oct 2012 23:54:17 +0000 (01:54 +0200)]
Merge branch 'MDL-35715-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE
Aparup Banerjee [Wed, 10 Oct 2012 05:03:23 +0000 (13:03 +0800)]
Merge branch 'MDL-35231_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Aparup Banerjee [Wed, 10 Oct 2012 02:32:02 +0000 (10:32 +0800)]
Merge branch 'w41_MDL-35839_m23_enroldeletecleanup' of git://github.com/skodak/moodle into MOODLE_23_STABLE
AMOS bot [Wed, 10 Oct 2012 00:34:20 +0000 (00:34 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Tue, 9 Oct 2012 09:59:46 +0000 (11:59 +0200)]
MDL-35898 test reset: Tidyup comment
Eloy Lafuente (stronk7) [Tue, 9 Oct 2012 09:58:35 +0000 (11:58 +0200)]
Merge branch 'w41_MDL-35898_m23_coursereset' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Aparup Banerjee [Tue, 9 Oct 2012 08:35:32 +0000 (16:35 +0800)]
MDL-35587 fixed up whitespaces
Aparup Banerjee [Tue, 9 Oct 2012 08:28:49 +0000 (16:28 +0800)]
Merge branch 'MDL-35587_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE
Frederic Massart [Tue, 9 Oct 2012 02:28:21 +0000 (10:28 +0800)]
MDL-35858 question: Fixed display of feedback in cloze questions
Petr Škoda [Tue, 9 Oct 2012 07:43:08 +0000 (09:43 +0200)]
MDL-35898 include static course caches in test resets
Aparup Banerjee [Tue, 9 Oct 2012 06:32:31 +0000 (14:32 +0800)]
Merge branch 'wip-MDL-30754-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
Aparup Banerjee [Tue, 9 Oct 2012 06:11:32 +0000 (14:11 +0800)]
Merge branch 'WIP-MDL-35724-M23_quiz' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE
Aparup Banerjee [Tue, 9 Oct 2012 03:53:43 +0000 (11:53 +0800)]
Merge branch 'MDL-35776_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Aparup Banerjee [Tue, 9 Oct 2012 02:25:33 +0000 (10:25 +0800)]
Merge branch 'MDL-35837-M23' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE
AMOS bot [Tue, 9 Oct 2012 00:34:42 +0000 (00:34 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Mon, 8 Oct 2012 23:38:22 +0000 (01:38 +0200)]
Merge branch 'wip-MDL-26348-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 8 Oct 2012 22:47:11 +0000 (00:47 +0200)]
Merge branch 'MDL-35141-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 8 Oct 2012 22:40:14 +0000 (00:40 +0200)]
Merge branch 'wip-mdl-35397-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 8 Oct 2012 22:26:49 +0000 (00:26 +0200)]
Merge branch 'MDL-35395_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Iñaki Arenaza [Thu, 26 Apr 2012 22:23:42 +0000 (00:23 +0200)]
MDL-31968 Make NTLM REMOTE_USER format configurable by the admin
Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>
Eloy Lafuente (stronk7) [Mon, 8 Oct 2012 22:08:26 +0000 (00:08 +0200)]
Merge branch 'MDL-34794_M23' of git://github.com/raymondAntonio/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 8 Oct 2012 21:57:11 +0000 (23:57 +0200)]
Merge branch 'wip-mdl-35047-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 8 Oct 2012 21:54:51 +0000 (23:54 +0200)]
Merge branch 'w41_MDL-35382_m23_reordertest' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 8 Oct 2012 21:08:02 +0000 (23:08 +0200)]
Merge branch 'MDL-35519_book_cancel_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 8 Oct 2012 20:54:33 +0000 (22:54 +0200)]
Revert "MDL-34894 course ws unit tests: fix windows problem."
This reverts commit
40d651bbbb20b4373b6b56e4e09c90b30ff86484.
With MDL-35714, each test gets gc_collect_cycles() called, so
no need to call it "manually".
Eloy Lafuente (stronk7) [Mon, 8 Oct 2012 20:52:12 +0000 (22:52 +0200)]
Merge branch 'w41_MDL-35714_m23_testgc' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Nadav Kavalerchik [Mon, 1 Oct 2012 21:13:21 +0000 (23:13 +0200)]
MDL-35724 - Move Question Marks block to the left (Question Bank page),in RTL mode
Nadav Kavalerchik [Mon, 1 Oct 2012 21:03:51 +0000 (23:03 +0200)]
MDL-35724 - Right align "Question Type" label in Quiz Editing page, when in RTL mode
Aparup Banerjee [Mon, 8 Oct 2012 09:26:45 +0000 (17:26 +0800)]
Merge branch '23STABLE-wip-MDL-35694' of git://github.com/jennymgray/moodle into MOODLE_23_STABLE
Aparup Banerjee [Mon, 8 Oct 2012 09:16:12 +0000 (17:16 +0800)]
Merge branch 'WIP-MDL-35723-M23_quiz' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE
Aparup Banerjee [Mon, 8 Oct 2012 09:06:43 +0000 (17:06 +0800)]
Merge branch 'w41_MDL-35739_m23_cliinstall' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Aparup Banerjee [Mon, 8 Oct 2012 07:28:37 +0000 (15:28 +0800)]
Merge branch 'wip-MDL-34448-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
Adrian Greeve [Tue, 2 Oct 2012 07:52:00 +0000 (15:52 +0800)]
MDL-34448 - mod/data - Fixing separate groups viewing all entries.
Marina Glancy [Thu, 4 Oct 2012 03:57:43 +0000 (11:57 +0800)]
MDL-35661 local plugins do not have general settings URL
Sam Hemelryk [Sun, 7 Oct 2012 22:36:21 +0000 (11:36 +1300)]
Merge branch 'MDL-35634-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Davo Smith [Wed, 3 Oct 2012 07:46:55 +0000 (08:46 +0100)]
MDL-35288 drag and drop upload - adjust error message text when attempting to upload a folder
Sam Hemelryk [Sun, 7 Oct 2012 22:02:33 +0000 (11:02 +1300)]
Merge branch 'MDL-35211_M23' of git://github.com/kordan/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 7 Oct 2012 21:44:18 +0000 (10:44 +1300)]
Merge branch 'MDL-35763-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE
Sam Hemelryk [Sun, 7 Oct 2012 21:22:06 +0000 (10:22 +1300)]
Merge branch 'MDL-33646-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 7 Oct 2012 21:15:37 +0000 (10:15 +1300)]
Merge branch 'MDL-35667_extra_credit_loop_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 7 Oct 2012 21:06:12 +0000 (10:06 +1300)]
Merge branch 'MDL-35730_23' of https://github.com/aolley/moodle into MOODLE_23_STABLE
Didier Raboud [Wed, 3 Oct 2012 13:53:16 +0000 (15:53 +0200)]
MDL-30754: Make sure to always display breadcrumbs when browsing categories.
Sam Hemelryk [Thu, 4 Oct 2012 03:40:26 +0000 (16:40 +1300)]
MDL-26348 tool_customlang: Fixed up SQL causing issues in Oracle
Petr Škoda [Sun, 7 Oct 2012 19:03:44 +0000 (21:03 +0200)]
MDL-35739 show langs on separate lines in CLI installer
This fixes column width issues and compatibility with RTL languages.
Petr Škoda [Sat, 6 Oct 2012 17:26:37 +0000 (19:26 +0200)]
MDL-35839 fix invalid enrol instance delete cleanup
Nadav Kavalerchik [Wed, 5 Sep 2012 14:54:26 +0000 (17:54 +0300)]
MDL-35245 - Missing scrollbar in Activity Chooser, when in RTL mode
Petr Skoda [Sat, 6 Oct 2012 11:27:04 +0000 (13:27 +0200)]
MDL-35382 fix random course test failures
Petr Škoda [Tue, 2 Oct 2012 11:35:32 +0000 (13:35 +0200)]
MDL-35714 run gc before test reset
AMOS bot [Sat, 6 Oct 2012 00:34:00 +0000 (00:34 +0000)]
Automatically generated installer lang files
Mary Evans [Sat, 6 Oct 2012 00:31:19 +0000 (01:31 +0100)]
MDL-35231 theme_serenity: fixed misalignment and styling of mod/assignment/action/edit by updating custommenu css in theme/serenity/style/core.css
Tim Hunt [Fri, 5 Oct 2012 16:12:11 +0000 (17:12 +0100)]
MDL-35395 formslib: a method to disable formchangechecker for a form.
Eloy Lafuente (stronk7) [Fri, 5 Oct 2012 11:38:50 +0000 (13:38 +0200)]
weekly release 2.3.2+
Eloy Lafuente (stronk7) [Fri, 5 Oct 2012 11:33:02 +0000 (13:33 +0200)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Fri, 5 Oct 2012 11:10:06 +0000 (13:10 +0200)]
Revert "MDL-34257 quiz 'secure' mode: PAGE initialisation order issues."
This reverts commit
d205afe662ba306833a525d87714d1994467dba7.
Dan Poltawski [Fri, 5 Oct 2012 08:20:52 +0000 (16:20 +0800)]
Revert "MDL-33117 grade: added some smarts to the user report method inject_rowspans() to deal with activity conditional availability"
This reverts commit
60b6b6280b8d9b3f7fdab93dc9dde9a2ca4a24e5.
Jenny Gray [Wed, 3 Oct 2012 08:27:36 +0000 (09:27 +0100)]
MDL-35694 logs: extend course log report downloads with action url
Ankit Agarwal [Thu, 4 Oct 2012 05:04:27 +0000 (13:04 +0800)]
MDL-33646 book: Adding a notice instead of error when there is no content in the book
Dan Poltawski [Thu, 4 Oct 2012 08:57:57 +0000 (16:57 +0800)]
Merge branch 'MDL-35767-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE
Ruslan Kabalin [Wed, 3 Oct 2012 12:42:10 +0000 (13:42 +0100)]
MDL-35767 Fix missing target event group check
Prevent interfering between items from different groups (and no groups)
AMOS bot [Thu, 4 Oct 2012 00:35:00 +0000 (00:35 +0000)]
Automatically generated installer lang files
Tim Hunt [Wed, 3 Oct 2012 17:46:07 +0000 (18:46 +0100)]
MDL-35776 user ajax: fix sort order in chrome.
It seems that Chrome orders fields of objects in order of array key.
Therefore we must stop using user.id in the PHP arrays, and instead
ensure that we use sequential numbers.
This commit fixes the enrol UI.
Tim Hunt [Wed, 3 Oct 2012 17:46:07 +0000 (18:46 +0100)]
MDL-35776 user ajax: fix sort order in chrome.
It seems that Chrome orders fields of objects in order of array key.
Therefore we must stop using user.id in the PHP arrays, and instead
ensure that we use sequential numbers.
This commit fixes the user selector.
Conflicts:
user/selector/module.js
user/selector/search.php
Frederic Massart [Wed, 3 Oct 2012 09:03:35 +0000 (17:03 +0800)]
MDL-35634 course: Restored alt attribute on module icons
Andrew Davis [Mon, 1 Oct 2012 02:05:22 +0000 (10:05 +0800)]
MDL-35519 mod_book: fixed the cancel import redirect URL
Damyon Wiese [Wed, 3 Oct 2012 03:52:50 +0000 (11:52 +0800)]
MDL-35763: Add ignoredirty class to drop down lists in assignment grading options form.
Dan Poltawski [Wed, 3 Oct 2012 02:26:22 +0000 (10:26 +0800)]
Merge branch 'MDL-35754-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Frederic Massart [Wed, 3 Oct 2012 01:49:01 +0000 (09:49 +0800)]
MDL-35754 libraries: openpopup() does not fail when window name is not set
Eloy Lafuente (stronk7) [Tue, 2 Oct 2012 22:40:35 +0000 (00:40 +0200)]
Merge branch 'MDL-35744_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 2 Oct 2012 21:07:16 +0000 (10:07 +1300)]
Merge branch 'MDL-33829_23' of https://github.com/andyjdavis/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 2 Oct 2012 20:53:11 +0000 (09:53 +1300)]
Merge branch 'MDL-35654_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Nadav Kavalerchik [Mon, 1 Oct 2012 20:46:50 +0000 (22:46 +0200)]
MDL-35723 - Align to center the "Quiz Feedback" label,when in RTL mode
Eloy Lafuente (stronk7) [Tue, 2 Oct 2012 19:40:58 +0000 (21:40 +0200)]
Merge branch 'm23_MDL-35227' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 2 Oct 2012 18:28:13 +0000 (20:28 +0200)]
Merge branch 'm23_MDL-35557' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
Tim Hunt [Tue, 2 Oct 2012 14:51:45 +0000 (15:51 +0100)]
MDL-35744 quiz: fix review options for Never submitted attempts
Eloy Lafuente (stronk7) [Tue, 2 Oct 2012 13:59:09 +0000 (15:59 +0200)]
Merge branch 'm23_MDL-35562' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
Ruslan Kabalin [Tue, 2 Oct 2012 13:35:28 +0000 (14:35 +0100)]
MDL-35715 course dragdrop Fix the ability to drag back to the empty section
Rajesh Taneja [Tue, 2 Oct 2012 06:19:09 +0000 (14:19 +0800)]
MDL-35047 tool_xmldb: Added missing strings for xmldb
Dan Poltawski [Tue, 2 Oct 2012 05:57:00 +0000 (13:57 +0800)]
Merge branch 'MDL-34570-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Rajesh Taneja [Tue, 2 Oct 2012 05:40:53 +0000 (13:40 +0800)]
MDL-35397 Administration: changed link for 'many other contributors'
Previously 'many other contributors' was pointing to http://docs.moodle.org/dev/Credits
now, it will point to http://moodle.org/dev.
Adam Olley [Tue, 20 Mar 2012 23:30:16 +0000 (10:00 +1030)]
enrol_manual: Set context correctly in manual enrolment user selector
Dan Poltawski [Tue, 2 Oct 2012 04:09:36 +0000 (12:09 +0800)]
Merge branch 'MDL-35370_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 2 Oct 2012 03:47:57 +0000 (11:47 +0800)]
Merge branch 'MDL-35693_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 2 Oct 2012 03:45:32 +0000 (11:45 +0800)]
Merge branch 'MDL-35665' of git://github.com/raymondAntonio/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 2 Oct 2012 03:40:23 +0000 (11:40 +0800)]
Merge branch 'MDL-35698_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 2 Oct 2012 03:36:56 +0000 (11:36 +0800)]
Merge branch 'WIP-MDL-35708-M23_quiz' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 2 Oct 2012 02:41:58 +0000 (10:41 +0800)]
Merge branch 'w40_MDL-35619_m23_otheravatars' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 2 Oct 2012 01:52:35 +0000 (09:52 +0800)]
Merge branch 'MDL-35680_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Jody Steele [Wed, 12 Sep 2012 15:06:08 +0000 (08:06 -0700)]
MDL-33933 mod_forum: fix incorrect capability check
Dan Poltawski [Tue, 2 Oct 2012 01:33:09 +0000 (09:33 +0800)]
Merge branch 'MDL-33117_grade_display_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 1 Oct 2012 23:33:59 +0000 (01:33 +0200)]
MDL-35669 gravatar amend and complete gravatar tests.
Eloy Lafuente (stronk7) [Mon, 1 Oct 2012 23:19:33 +0000 (01:19 +0200)]
MDL-35669 gravatar Fix secure image urls.
Sam Hemelryk [Mon, 1 Oct 2012 22:10:24 +0000 (11:10 +1300)]
Merge branch 'm23_MDL-35472' of git://github.com/totara/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 1 Oct 2012 21:45:51 +0000 (10:45 +1300)]
Merge branch 'MDL-34257_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Michael Aherne [Fri, 28 Sep 2012 11:31:36 +0000 (12:31 +0100)]
MDL-35669 gravatar Provide default image URL to Gravatar
Sam Hemelryk [Mon, 1 Oct 2012 21:31:08 +0000 (10:31 +1300)]
Merge branch 'MDL-30885_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
