Dan Poltawski [Wed, 31 Oct 2012 05:42:23 +0000 (13:42 +0800)]
Merge branch 'MDL-28235-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Frederic Massart [Wed, 31 Oct 2012 04:59:07 +0000 (12:59 +0800)]
MDL-28235 form: Removed reference to unexisting close button in help popup
Frederic Massart [Tue, 2 Oct 2012 06:34:15 +0000 (14:34 +0800)]
MDL-28235 form: Removed close icon of help icon popups
Frederic Massart [Tue, 2 Oct 2012 06:28:55 +0000 (14:28 +0800)]
MDL-28235 form: Help button popup close accessibility improved
AMOS BEGIN
CPY [close,editor],[close,form]
AMOS END
Dan Poltawski [Wed, 31 Oct 2012 02:50:53 +0000 (10:50 +0800)]
Merge branch 'wip-mdl-29762-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
Aparup Banerjee [Wed, 31 Oct 2012 02:05:26 +0000 (10:05 +0800)]
Merge branch 'MDL-31708-moodle23' of git://github.com/StudiUM/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 30 Oct 2012 21:15:29 +0000 (10:15 +1300)]
Merge branch 'MDL-31934_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Mary Evans [Tue, 30 Oct 2012 11:43:09 +0000 (11:43 +0000)]
MDL-31934 mod/forum: Added CSS fix to mod/forum/styles.css for unread forumposts also reversed a previous commit in theme/base/core.css.
Dan Poltawski [Tue, 30 Oct 2012 05:40:33 +0000 (13:40 +0800)]
Merge branch 'wip-MDL-32326-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 30 Oct 2012 04:36:45 +0000 (17:36 +1300)]
Merge branch 'MDL-28235-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 30 Oct 2012 04:11:52 +0000 (12:11 +0800)]
Merge branch 'wip-mdl-35489-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 30 Oct 2012 02:48:49 +0000 (15:48 +1300)]
Merge branch 'MDL-35889-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 30 Oct 2012 02:19:26 +0000 (10:19 +0800)]
Merge branch 'MDL-36015_23' of git://git.catalyst.net.nz/moodle-r2 into MOODLE_23_STABLE
Dan Poltawski [Tue, 30 Oct 2012 02:00:21 +0000 (10:00 +0800)]
Merge branch 'wip-mdl-35910-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
Andrew Robert Nicols [Wed, 10 Oct 2012 10:01:52 +0000 (11:01 +0100)]
MDL-35959 Correct footer for M.core.dialogue
Sam Hemelryk [Tue, 30 Oct 2012 00:02:07 +0000 (13:02 +1300)]
Merge branch 'WIP-MDL-36070-M23' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE
Conflicts:
mod/quiz/styles.css
Sam Hemelryk [Mon, 29 Oct 2012 23:59:12 +0000 (12:59 +1300)]
Merge branch 'MDL-36076_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Michael Aherne [Wed, 17 Oct 2012 11:37:43 +0000 (12:37 +0100)]
MDL-36101 auth_shibboleth Show appropriate error message for suspended accounts
Sam Hemelryk [Mon, 29 Oct 2012 23:51:44 +0000 (12:51 +1300)]
Merge branch 'MDL-36103_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Charles Fulton [Wed, 17 Oct 2012 18:07:12 +0000 (11:07 -0700)]
MDL-36105 grades: use consistent icon classs
Sam Hemelryk [Mon, 29 Oct 2012 23:24:19 +0000 (12:24 +1300)]
Merge branch 'wip-mdl-36131-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 29 Oct 2012 23:16:50 +0000 (12:16 +1300)]
Merge branch 'MDL-36137_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 29 Oct 2012 07:33:53 +0000 (15:33 +0800)]
Merge branch 'm23_MDL-35215' of git://github.com/totara/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 29 Oct 2012 07:21:48 +0000 (15:21 +0800)]
Merge branch 'MDL-34363_m23' of git://github.com/merrill-oakland/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 29 Oct 2012 06:59:57 +0000 (14:59 +0800)]
Merge branch 'WIP-MDL-36033-M23' of git://github.com/nadavkav/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 29 Oct 2012 06:57:24 +0000 (14:57 +0800)]
Merge branch 'wip-MDL-36075_MOODLE_23_STABLE' of git://github.com/jason-platts/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 29 Oct 2012 06:35:28 +0000 (14:35 +0800)]
Merge branch 'MDL-35880-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 29 Oct 2012 05:55:14 +0000 (13:55 +0800)]
Merge branch 'MDL-34837-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 29 Oct 2012 01:54:12 +0000 (09:54 +0800)]
Merge branch 'MDL-35297_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
Andrew Robert Nicols [Sun, 7 Oct 2012 08:55:08 +0000 (09:55 +0100)]
MDL-35836 Rewrite doctonewwindow handling to use delegation instead of individual events
Eloy Lafuente (stronk7) [Sun, 21 Oct 2012 07:56:01 +0000 (15:56 +0800)]
MDL-35297 book: replay some steps lost when book landed to core
This commit replays, conditionally, all the upgrade steps from
MOODLE_19_STABLE to MOODLE_23_STABLE in the mod_book activity. That
guarentees that any site using the mod_book before landing to core,
no matter if it was the latest or an outdated one will upgrade
perfectly to the expected current version.
As a general rule, everytime one contrib plugin lands to core, its
complete upgrade code must be kept, at least until the core version
that introduced it, is out completely from the upgrade requirement
conditions.
In this case, with the missing upgrade code being added to 2.4, it
will be safe to delete the upgrade steps once 2.5 (or upwards) become
a requirement. Never always.
Conflicts:
mod/book/version.php
Mary Evans [Sun, 21 Oct 2012 00:39:30 +0000 (01:39 +0100)]
MDL-31934 theme_base: Adds highlight color to unread forum posts.
Mary Evans [Fri, 19 Oct 2012 22:39:01 +0000 (23:39 +0100)]
MDL-36137 theme_magazine: changed forum and description info from center to left aligned.
Eloy Lafuente (stronk7) [Fri, 19 Oct 2012 11:56:32 +0000 (19:56 +0800)]
weekly release 2.3.2+ (fix!)
Rajesh Taneja [Fri, 19 Oct 2012 03:58:25 +0000 (11:58 +0800)]
MDL-36131 AJAX: Conditional activities will behave same as in non-ajax mode
Tim Hunt [Fri, 19 Oct 2012 08:49:34 +0000 (16:49 +0800)]
MDL-36103 tablelib: links to user profiles are wrong in courses.
Nadav Kavalerchik [Sun, 14 Oct 2012 11:49:07 +0000 (13:49 +0200)]
MDL-36033 - Left align Numeric value fields in Calculated and Numeric question, when in RTL mode
Nadav Kavalerchik [Tue, 16 Oct 2012 08:44:34 +0000 (10:44 +0200)]
MDL-36070 - Points label hides UP and Down ordering arrows and Delete Icon on Quiz edit page, in RTL mode (theme/standard)
Rajesh Taneja [Fri, 19 Oct 2012 08:07:05 +0000 (16:07 +0800)]
MDL-35910 Assignment 2.2: Fixed included files in assignment zip.
If Marking button is enabled, assignment is open and is not finalized, then don't add file to zip
Gilles-Philippe Leblanc [Thu, 18 Oct 2012 12:51:51 +0000 (08:51 -0400)]
MDL-31708 wiki: Wiki 2.0 non-group member can see edit option in navigation block
Aparup Banerjee [Thu, 18 Oct 2012 11:43:28 +0000 (19:43 +0800)]
weekly release 2.3.3+
Aparup Banerjee [Thu, 18 Oct 2012 11:21:29 +0000 (19:21 +0800)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE
Rajesh Taneja [Thu, 18 Oct 2012 06:13:18 +0000 (14:13 +0800)]
MDL-35489 users: Check added before using form data
AMOS bot [Thu, 18 Oct 2012 00:34:55 +0000 (00:34 +0000)]
Automatically generated installer lang files
Tim Hunt [Wed, 17 Oct 2012 05:54:45 +0000 (13:54 +0800)]
MDL-36076 qtype multichoice: validation fails on '0' answer.
Aparup Banerjee [Wed, 17 Oct 2012 02:40:03 +0000 (10:40 +0800)]
Merge branch 'MDL-28965-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
AMOS bot [Wed, 17 Oct 2012 00:34:38 +0000 (00:34 +0000)]
Automatically generated installer lang files
Jason Platts [Tue, 16 Oct 2012 11:09:51 +0000 (12:09 +0100)]
MDL-36075 Forms: Date selector in forms errors in IE7
Sam Hemelryk [Tue, 16 Oct 2012 09:41:31 +0000 (17:41 +0800)]
Merge branch 'MDL-35412-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Frederic Massart [Tue, 16 Oct 2012 09:21:11 +0000 (17:21 +0800)]
MDL-35412 phpunit: date_format_string() is case insensitive
Frederic Massart [Tue, 16 Oct 2012 03:50:25 +0000 (11:50 +0800)]
MDL-35412 core: Moving get_string out of if statement
Frederic Massart [Thu, 20 Sep 2012 09:18:33 +0000 (17:18 +0800)]
MDL-35171 Forms: Date selector always gets UTF-8 strings
Dan Poltawski [Tue, 16 Oct 2012 08:27:51 +0000 (16:27 +0800)]
Merge branch 'wip-mdl-30691-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 16 Oct 2012 08:20:12 +0000 (16:20 +0800)]
MDL-34228 - version.php - bump for new capability
Dan Poltawski [Tue, 16 Oct 2012 08:19:33 +0000 (16:19 +0800)]
Merge branch 'MDL-34228-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 16 Oct 2012 06:59:15 +0000 (14:59 +0800)]
Merge branch 'wip-mdl-27309-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 16 Oct 2012 06:35:37 +0000 (14:35 +0800)]
Merge branch 'wip-mdl-32218-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
Ankit Agarwal [Tue, 16 Oct 2012 05:16:41 +0000 (13:16 +0800)]
MDL-35880 user: Adding a heading to profile edit page
Sam Hemelryk [Tue, 16 Oct 2012 05:32:34 +0000 (13:32 +0800)]
MDL-33857 fixed up whitespace
Sam Hemelryk [Tue, 16 Oct 2012 05:31:31 +0000 (13:31 +0800)]
Merge branch 'wip-MDL-33857-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
Rajesh Taneja [Mon, 15 Oct 2012 08:26:17 +0000 (16:26 +0800)]
MDL-29762 Blocks: Modified checks to show image in html block
Sam Hemelryk [Tue, 16 Oct 2012 03:23:02 +0000 (11:23 +0800)]
Merge branch 'MDL-35198-MOODLE_23_STABLE' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 16 Oct 2012 03:09:06 +0000 (11:09 +0800)]
Merge branch 'MDL-33815_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Adrian Greeve [Mon, 8 Oct 2012 01:03:49 +0000 (09:03 +0800)]
MDL-35265 - blog - Update code for removing orphaned blog association data.
Conflicts:
version.php
Dan Poltawski [Tue, 16 Oct 2012 02:46:49 +0000 (10:46 +0800)]
Merge branch 'wip-MDL-32184-s23' of github.com/phalacee/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 16 Oct 2012 02:42:42 +0000 (10:42 +0800)]
Merge branch 'MDL-35664-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 16 Oct 2012 02:31:51 +0000 (10:31 +0800)]
Merge branch 'MDL-35892-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 16 Oct 2012 02:26:33 +0000 (10:26 +0800)]
MDL-21801 - mod_lesson: version bump
To reflect the new (ppt-less) state
Dan Poltawski [Tue, 16 Oct 2012 02:30:00 +0000 (10:30 +0800)]
Merge branch 'MDL-21801_b_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 16 Oct 2012 02:16:19 +0000 (10:16 +0800)]
Merge branch 'MDL-35726-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE
Adrian Greeve [Tue, 9 Oct 2012 07:56:40 +0000 (15:56 +0800)]
MDL-25275 - mod/data - Added a check box to eliminate date searches if desired.
Mark Nielsen [Mon, 15 Oct 2012 09:18:34 +0000 (17:18 +0800)]
MDL-34837 backup: Restore does not fail when some courses have the same name
Dan Poltawski [Mon, 15 Oct 2012 08:03:59 +0000 (16:03 +0800)]
Merge branch 'w42_MDL-35854_m23_usergenerator' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 15 Oct 2012 07:59:15 +0000 (15:59 +0800)]
Merge branch 'w42_MDL-35917_m23_cohortdoc' of git://github.com/skodak/moodle into MOODLE_23_STABLE
Aparup Banerjee [Mon, 15 Oct 2012 07:53:40 +0000 (15:53 +0800)]
Merge branch 'MDL-31010-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE
Aparup Banerjee [Mon, 15 Oct 2012 06:16:06 +0000 (14:16 +0800)]
Merge branch 'MDL-35986' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
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
Ankit Agarwal [Mon, 15 Oct 2012 02:56:34 +0000 (10:56 +0800)]
MDL-35889 blocks: Adding a legend to the fieldset
Frederic Massart [Tue, 9 Oct 2012 03:01:39 +0000 (11:01 +0800)]
MDL-35892 repository: prepare_listing recursively prepares the data
Frederic Massart [Tue, 9 Oct 2012 03:12:37 +0000 (11:12 +0800)]
MDL-35664 filepicker: Filepicker knows about the current path and uses it
AMOS bot [Mon, 15 Oct 2012 00:34:57 +0000 (00:34 +0000)]
Automatically generated installer lang files
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)
Petr Škoda [Sat, 13 Oct 2012 15:54:30 +0000 (17:54 +0200)]
MDL-35917 fix cohort phpdocs
Credit goes to Brian Kremer, thanks!
Petr Škoda [Tue, 9 Oct 2012 21:04:51 +0000 (23:04 +0200)]
MDL-35854 fix username generator
This eliminates infinite loop and also fixes potentially invalid email derived from usernames created from unicode first/last name.
Mary Evans [Fri, 12 Oct 2012 21:57:39 +0000 (22:57 +0100)]
MDL-35986 theme_canvas: add custommenu and block-region to layout files general.php, frontpage.php and report.php to fix regression in theme/serenity since MDL-33110.
Damyon Wiese [Fri, 12 Oct 2012 03:58:11 +0000 (11:58 +0800)]
MDL-35726: Use a different form identifier for each form when using "Save and next"
This prevents a bug where the next student feedback will default to the values that
were on the last submitted form. This is a similar case to having multiple instances
of the same form on the same page - each one needs a unique identifier to distinguish
between them. In this case I include the $rownum which changes as you go to each student
in the list.
Jonathan Harker [Fri, 12 Oct 2012 00:31:47 +0000 (13:31 +1300)]
MDL-36015 lib/bennu: use static functions correctly.
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
Rossiani Wijaya [Thu, 11 Oct 2012 08:11:58 +0000 (16:11 +0800)]
MDL-21801 Lesson Module: Removing import power point functionality
Rossiani Wijaya [Thu, 11 Oct 2012 08:02:16 +0000 (16:02 +0800)]
MDL-33815 Online Users block: Add query condition to filter out deleted users and lastaccess date greater than now
Ankit Agarwal [Thu, 11 Oct 2012 06:22:34 +0000 (14:22 +0800)]
MDL-28965 administration: Updating description string for the setting navshowallcourses
Ankit Agarwal [Thu, 11 Oct 2012 02:55:37 +0000 (10:55 +0800)]
MDL-31010 comments: setup_course should update if passed courseid is different from the cached one
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
Simon Coggins [Tue, 9 Oct 2012 19:52:58 +0000 (08:52 +1300)]
MDL-35581 lib: Help popups misaligned for right-to-left languages
Eloy Lafuente (stronk7) [Tue, 9 Oct 2012 09:59:46 +0000 (11:59 +0200)]
MDL-35898 test reset: Tidyup comment