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
Eloy Lafuente (stronk7) [Fri, 19 Oct 2012 11:56:32 +0000 (19:56 +0800)]
weekly release 2.3.2+ (fix!)
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
AMOS bot [Thu, 18 Oct 2012 00:34:55 +0000 (00:34 +0000)]
Automatically generated installer lang files
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
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
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
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.
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
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.
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
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
Rajesh Taneja [Fri, 5 Oct 2012 03:47:14 +0000 (11:47 +0800)]
MDL-30691 Adminstration: Added css to break long word in filter table
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.