Sam Hemelryk [Tue, 13 Mar 2012 01:04:44 +0000 (14:04 +1300)]
Merge branch 'MDL-31917-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 13 Mar 2012 01:00:41 +0000 (14:00 +1300)]
Merge branch 'MDL-31919-master-2' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 23:15:59 +0000 (00:15 +0100)]
Merge branch 'w11_MDL-31985_m23_lobsizes' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Mar 2012 23:00:08 +0000 (12:00 +1300)]
Merge branch 'w11_MDL-27457_m23_enrolnorecover' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Mar 2012 22:55:54 +0000 (11:55 +1300)]
Merge branch 'MDL-30298_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 22:16:27 +0000 (23:16 +0100)]
Merge branch 'w11_MDL-31899_m23_mysqlcolumns' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Mar 2012 21:34:03 +0000 (10:34 +1300)]
Merge branch 'MDL-31702' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 12 Mar 2012 21:10:36 +0000 (10:10 +1300)]
Merge branch 'MDL-31362_unused_constant' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 20:36:36 +0000 (21:36 +0100)]
Merge branch 'w11_MDL-31956_m23_paypal' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 18:34:29 +0000 (19:34 +0100)]
MDL-31805 html2text - change tests acordingly with the new version
With the new version in place, both <th> and <a> contents are
being handled by the conversion. Accomodate existing tests to
that change.
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 19:18:09 +0000 (20:18 +0100)]
Merge branch 'MDL-31979-master' of git://github.com/micaherne/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 17:04:55 +0000 (18:04 +0100)]
Merge branch 'w11_MDL-31805_m23_html2text' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 17:00:23 +0000 (18:00 +0100)]
Merge branch 'w11_MDL-31595_m23_enrolme' of git://github.com/skodak/moodle
Petr Skoda [Mon, 12 Mar 2012 16:18:55 +0000 (17:18 +0100)]
MDL-31805 migrate html2text tests from web lib to new location
Note: the handling of <p> seems to have changed, it does double newlines only between paragraphs now (this makes sense to me).
Petr Skoda [Mon, 12 Mar 2012 15:47:28 +0000 (16:47 +0100)]
MDL-31595 improve enrol link comments
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 15:33:27 +0000 (16:33 +0100)]
Merge branch 'w11_MDL-31815_m23_confirmemail' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 14:49:04 +0000 (15:49 +0100)]
Merge branch 'w11_MDL-31534_m23_pageinitroot' of git://github.com/skodak/moodle
Petr Skoda [Mon, 12 Mar 2012 12:58:01 +0000 (13:58 +0100)]
MDL-31534 init PAGE before require_login()
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 12:38:30 +0000 (13:38 +0100)]
Merge branch 'w11_MDL-31494_m23_adodblink' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 12 Mar 2012 11:47:56 +0000 (12:47 +0100)]
Merge branch 'w11_MDL-29514_m23_enum' of git://github.com/skodak/moodle
Mary Evans [Mon, 12 Mar 2012 10:37:35 +0000 (10:37 +0000)]
MDL-30298 report_progress: adds outer wrapper with class no-overflow to report table so as to enable horizontal scroll bar
Michael Aherne [Fri, 9 Mar 2012 16:14:07 +0000 (16:14 +0000)]
MDL-31979 Typo in config-dist.php
Sam Hemelryk [Mon, 12 Mar 2012 04:29:39 +0000 (17:29 +1300)]
Merge branch 'master_MDL-31888' of git://github.com/danmarsden/moodle
Conflicts:
mod/scorm/styles.css
Sam Hemelryk [Mon, 12 Mar 2012 04:20:37 +0000 (17:20 +1300)]
MDL-27304 mod_wiki: Fixed up phpdocs for globals
Sam Hemelryk [Mon, 12 Mar 2012 04:20:01 +0000 (17:20 +1300)]
Merge branch 'MDL-27304-master' of https://github.com/mackensen/moodle
Charles Fulton [Fri, 17 Feb 2012 21:19:25 +0000 (13:19 -0800)]
MDL-31664 fix invalid boolean to string comparison
Sam Hemelryk [Mon, 12 Mar 2012 03:36:29 +0000 (16:36 +1300)]
MDL-27212 Fixed up whitespace after integration
Sam Hemelryk [Mon, 12 Mar 2012 03:28:16 +0000 (16:28 +1300)]
Merge branch 'MDL-27212-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 12 Mar 2012 02:19:20 +0000 (15:19 +1300)]
Merge branch 'MDL-28998-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 12 Mar 2012 02:15:23 +0000 (15:15 +1300)]
Merge branch 'MDL-31811-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 12 Mar 2012 01:57:11 +0000 (14:57 +1300)]
Merge branch 'MDL-31877-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 12 Mar 2012 01:54:42 +0000 (14:54 +1300)]
Merge branch 'MDL-31918-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 12 Mar 2012 01:33:42 +0000 (14:33 +1300)]
Merge branch 'MDL-31923-master-6' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 12 Mar 2012 01:22:20 +0000 (14:22 +1300)]
Merge branch 'MDL-31841_feedback_align' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 12 Mar 2012 01:20:02 +0000 (14:20 +1300)]
Merge branch 'wip-MDL-30906-master' of git://github.com/abgreeve/moodle
Petr Skoda [Sun, 11 Mar 2012 14:55:37 +0000 (15:55 +0100)]
MDL-31985 remove text sizes from all install.xml files
Petr Skoda [Sun, 11 Mar 2012 14:51:49 +0000 (15:51 +0100)]
MDL-31985 convert all existing LOBs
Mary Evans [Sun, 11 Mar 2012 14:09:37 +0000 (14:09 +0000)]
MDL-30298 report_completion: adds outer wrapper with class no-overflow to report table so as to enable horizontal scroll bar
Petr Skoda [Sun, 11 Mar 2012 12:42:37 +0000 (13:42 +0100)]
MDL-31985 remove LOB sizes from code and UI
Mary Evans [Sun, 11 Mar 2012 01:25:25 +0000 (01:25 +0000)]
MDL-30298 theme_binarius: adds horizontal scroll to report layout
Petr Skoda [Sat, 10 Mar 2012 18:33:22 +0000 (19:33 +0100)]
MDL-31899 use information_schema for normal db tables in get_columns()
This change is based on patch by Charles Fulton.
Petr Skoda [Sat, 10 Mar 2012 18:18:15 +0000 (19:18 +0100)]
MDL-31899 add extra text size unit tests
Petr Skoda [Sat, 10 Mar 2012 16:46:09 +0000 (17:46 +0100)]
MDL-29514 drop support for enum data types
Petr Skoda [Sat, 10 Mar 2012 12:01:04 +0000 (13:01 +0100)]
MDL-31956 fix enrol string components
Credit goes to Mark Nelson
Petr Skoda [Sat, 10 Mar 2012 11:45:12 +0000 (12:45 +0100)]
MDL-31805 test invalid html processing in html2text
Petr Skoda [Sat, 10 Mar 2012 11:40:04 +0000 (12:40 +0100)]
MDL-31805 import html2text revision 5886 with our customisations
snapshot from https://github.com/moodle/custom-html2text/tree/MOODLE_5886_1
Petr Skoda [Sat, 10 Mar 2012 11:38:52 +0000 (12:38 +0100)]
MDL-31805 add tests for our html2text tweaks
Petr Skoda [Sat, 10 Mar 2012 10:04:51 +0000 (11:04 +0100)]
MDL-31494 fix link to adodb driver docs
target="_bank" is valid again in html5, it does help a lot here no matter what legacy accessibility guides say…
Petr Skoda [Sat, 10 Mar 2012 09:46:36 +0000 (10:46 +0100)]
MDL-31815 encode dots in confirm url which helps email clients with url highlighting
Petr Skoda [Sat, 10 Mar 2012 08:59:25 +0000 (09:59 +0100)]
MDL-27457 fix JS error on enrol when grade history disabled
Petr Skoda [Sat, 10 Mar 2012 08:40:42 +0000 (09:40 +0100)]
MDL-31595 do not show enrolee link to guest account
Tim Hunt [Fri, 9 Mar 2012 11:28:20 +0000 (11:28 +0000)]
MDL-31702 quiz: clarify error message that has been confusing people.
Eloy Lafuente (stronk7) [Fri, 9 Mar 2012 10:56:22 +0000 (11:56 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
AMOS bot [Fri, 9 Mar 2012 10:54:12 +0000 (11:54 +0100)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Fri, 9 Mar 2012 10:13:09 +0000 (11:13 +0100)]
weekly release 2.3dev
Eloy Lafuente (stronk7) [Fri, 9 Mar 2012 10:03:53 +0000 (11:03 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Fri, 9 Mar 2012 08:44:30 +0000 (09:44 +0100)]
Merge branch 'wip-MDL-31248-master-v3' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Fri, 9 Mar 2012 08:37:06 +0000 (09:37 +0100)]
Revert "MDL-31248 - lib - Alteration to the rc4encrypt function to allow for old password use."
This reverts commit
6aa13eb36b79677a0a98058e048f74ed4b89f2e8.
Ankit Agarwal [Thu, 1 Mar 2012 08:12:52 +0000 (16:12 +0800)]
MDL-2712 tags: removing the anchor links when there are no results
Ankit Agarwal [Thu, 1 Mar 2012 01:05:27 +0000 (09:05 +0800)]
MDL-28998 libraries: Adding validation to customisable profile fields during signup
Adrian Greeve [Mon, 27 Feb 2012 04:07:58 +0000 (12:07 +0800)]
MDL-31248 - lib - Retaining the old password key and creating a new cookie prefix.
Eloy Lafuente (stronk7) [Fri, 9 Mar 2012 00:58:09 +0000 (01:58 +0100)]
Revert "[MDL-31708] - wiki 2.0 non-group member can see edit option in navigation block."
This reverts commit
ebadb9b9a674f5e91ddb7460ea3f9dafc6c34523.
Eloy Lafuente (stronk7) [Fri, 9 Mar 2012 00:58:01 +0000 (01:58 +0100)]
Revert "MDL-31708 wiki groups: whitespace fix"
This reverts commit
6273fb83770305c2631e13c309d1409d75c5b3d0.
Andrew Robert Nicols [Tue, 6 Mar 2012 16:11:49 +0000 (16:11 +0000)]
MDL-31923 Correctly respect hiddenfields and capabilities
Andrew Davis [Sun, 4 Mar 2012 05:21:03 +0000 (12:21 +0700)]
MDL-31841 grade: prevented the feedback column on the user report from being centered
Eloy Lafuente (stronk7) [Thu, 8 Mar 2012 01:27:55 +0000 (02:27 +0100)]
Merge branch 'wip-MDL-31248-master-v2' of git://github.com/abgreeve/moodle
AMOS bot [Thu, 8 Mar 2012 00:31:35 +0000 (00:31 +0000)]
Automatically generated installer lang files
Adrian Greeve [Mon, 27 Feb 2012 04:07:58 +0000 (12:07 +0800)]
MDL-31248 - lib - Alteration to the rc4encrypt function to allow for old password use.
Eloy Lafuente (stronk7) [Wed, 7 Mar 2012 23:48:04 +0000 (00:48 +0100)]
Merge branch 'wip-MDL-29086-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Wed, 7 Mar 2012 20:41:36 +0000 (21:41 +0100)]
Merge branch 'wip-MDL-30991-master' of git://github.com/phalacee/moodle
Andrew Robert Nicols [Tue, 6 Mar 2012 14:36:20 +0000 (14:36 +0000)]
MDL-31918 Use cached module info for activity completion report
Eloy Lafuente (stronk7) [Wed, 7 Mar 2012 14:39:01 +0000 (15:39 +0100)]
Merge branch 'MDL-31712_master' of git://github.com/kordan/moodle
Petr Skoda [Mon, 27 Feb 2012 11:30:11 +0000 (12:30 +0100)]
MDL-31689 fix moodle_database:execute() description
Eloy Lafuente (stronk7) [Wed, 7 Mar 2012 09:58:56 +0000 (10:58 +0100)]
MDL-31832 CLI upgrade will return 0 exit status if no upgrade is needed
Discussed with David, both points were valid but finally
we agreed about to consider the "no upgrade needed" exit
a normal/succesful one, mainly because it keeps previous
behavior the same (exit non-zero only for real errors).
David Mudrak [Thu, 1 Mar 2012 00:56:53 +0000 (01:56 +0100)]
MDL-31832 CLI upgrade checks if the upgrade is actually needed
Eloy Lafuente (stronk7) [Wed, 7 Mar 2012 03:00:39 +0000 (04:00 +0100)]
MDL-28364 whitespace fixes
Eloy Lafuente (stronk7) [Wed, 7 Mar 2012 02:55:53 +0000 (03:55 +0100)]
Merge branch 'MDL-28364' of git://github.com/jonof/moodle
Eloy Lafuente (stronk7) [Wed, 7 Mar 2012 01:19:59 +0000 (02:19 +0100)]
MDL-30976 whitespace fixes
Eloy Lafuente (stronk7) [Wed, 7 Mar 2012 01:10:40 +0000 (02:10 +0100)]
Merge branch 'MDL-30996-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 7 Mar 2012 00:47:31 +0000 (01:47 +0100)]
MDL-23787 data: Init 2 arrays (global scope) that may conflict with other global scope code
AMOS bot [Wed, 7 Mar 2012 00:31:41 +0000 (00:31 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 7 Mar 2012 00:22:54 +0000 (01:22 +0100)]
Merge branch 'wip-MDL-23787-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 6 Mar 2012 23:18:27 +0000 (00:18 +0100)]
Merge branch 'MDL-31255-master-3' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 6 Mar 2012 22:46:42 +0000 (11:46 +1300)]
Merge branch 'MDL-28387-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 6 Mar 2012 20:30:25 +0000 (21:30 +0100)]
Merge branch 'MDL-31876-question_has_capability_on-memory-bloat' of git://github.com/dhg-atarplpl/moodle
Eloy Lafuente (stronk7) [Tue, 6 Mar 2012 20:18:04 +0000 (21:18 +0100)]
Merge branch 'MDL-31829' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 6 Mar 2012 20:10:02 +0000 (21:10 +0100)]
Merge branch 'w10_MDL-31079_m23_minifydebug' of git://github.com/skodak/moodle
Dan Marsden [Tue, 6 Mar 2012 20:01:45 +0000 (09:01 +1300)]
MDL-31888 SCORM prevent scrollbars on yui div
Ruslan Kabalin [Tue, 6 Mar 2012 14:54:13 +0000 (14:54 +0000)]
MDL-31919 Fix assignment overview output to respect gradebook grading.
Currenly, if assigment has been graded in gradebook only, in the assigment
overview it is listed as not graded.
Charles Fulton [Tue, 6 Mar 2012 16:33:12 +0000 (08:33 -0800)]
MDL-27304 wiki: link to user's course profile
Ruslan Kabalin [Tue, 6 Mar 2012 14:50:55 +0000 (14:50 +0000)]
MDL-31917 Improve assigment submission usability
Say 'View' if assignment has been graded via gradebook and changing
grades via submissions interface is not possible.
Eloy Lafuente (stronk7) [Tue, 6 Mar 2012 15:18:58 +0000 (16:18 +0100)]
MDL-31301 textlib: fix deprecated initial version
Eloy Lafuente (stronk7) [Tue, 6 Mar 2012 15:06:53 +0000 (16:06 +0100)]
Merge branch 'w10_MDL-31301_m23_textlibcleanup' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 6 Mar 2012 14:38:29 +0000 (15:38 +0100)]
Merge branch 'w10_MDL-31361_m23_dbunenrol' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 6 Mar 2012 12:35:40 +0000 (13:35 +0100)]
Merge branch 'w10_MDL-30636_m23_tinymce' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 6 Mar 2012 12:01:39 +0000 (13:01 +0100)]
Merge branch 'w10_MDL-31785_m23_htmlpurifier' of git://github.com/skodak/moodle
Petr Skoda [Wed, 29 Feb 2012 09:27:41 +0000 (10:27 +0100)]
MDL-27982 add unsigned removal for mysql
Petr Skoda [Sun, 22 Jan 2012 16:55:12 +0000 (17:55 +0100)]
MDL-27982 convert all signed to unsigned and prevent adding of new unsigned columns
Conflicts, amended to use .02 versions:
lib/db/upgrade.php, version.php
Petr Skoda [Sun, 22 Jan 2012 17:01:16 +0000 (18:01 +0100)]
MDL-27982 remove unsigned support from all UIs and APIs, keep only public API for BC
Petr Skoda [Sun, 22 Jan 2012 17:15:02 +0000 (18:15 +0100)]
MDL-27982 drop UNSIGNED attributes from all install.xml files
