moodle.git
9 years agoMDL-32053 question: Question bank table displayed inconsistently
M Kassaei [Thu, 15 Mar 2012 09:33:51 +0000 (09:33 +0000)]
MDL-32053 question: Question bank table displayed inconsistently

9 years agoMDL-32048 mod_quiz: Question bank select/deselect all shows strange behaviour in IE
M Kassaei [Wed, 14 Mar 2012 14:52:10 +0000 (14:52 +0000)]
MDL-32048 mod_quiz: Question bank select/deselect all shows strange behaviour in IE

9 years agoMerge branch 'MDL-32064' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 19 Mar 2012 21:37:38 +0000 (10:37 +1300)]
Merge branch 'MDL-32064' of git://github.com/timhunt/moodle

9 years agoMDL-19125 upgrade: Fixed assignment typo
Sam Hemelryk [Mon, 19 Mar 2012 21:34:30 +0000 (10:34 +1300)]
MDL-19125 upgrade: Fixed assignment typo

9 years agoMerge branch 'MDL-32084_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 19 Mar 2012 07:38:28 +0000 (20:38 +1300)]
Merge branch 'MDL-32084_master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'w12_MDL-32090_m23_groupui' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Mar 2012 07:33:48 +0000 (20:33 +1300)]
Merge branch 'w12_MDL-32090_m23_groupui' of git://github.com/skodak/moodle

9 years agoMerge branch 'w12_MDL-32046_m23_lastdbuser' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Mar 2012 07:29:39 +0000 (20:29 +1300)]
Merge branch 'w12_MDL-32046_m23_lastdbuser' of git://github.com/skodak/moodle

9 years agoMDL-27553 admin: Fixed override bug
Petr Skoda [Mon, 19 Mar 2012 07:21:33 +0000 (20:21 +1300)]
MDL-27553 admin: Fixed override bug

9 years agoMerge branch 'w12_MDL-31703_m23_rootdirroot' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 19 Mar 2012 07:16:34 +0000 (20:16 +1300)]
Merge branch 'w12_MDL-31703_m23_rootdirroot' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-mdl-26674' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 19 Mar 2012 07:06:40 +0000 (20:06 +1300)]
Merge branch 'wip-mdl-26674' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-31984 Fixed whitespace during integration
Sam Hemelryk [Mon, 19 Mar 2012 06:12:02 +0000 (19:12 +1300)]
MDL-31984 Fixed whitespace during integration

9 years agoMDL-31984: add debugging message if theme renderer file is missnamed
Brian Jorgensen [Mon, 12 Mar 2012 18:38:53 +0000 (12:38 -0600)]
MDL-31984: add debugging message if theme renderer file is missnamed

9 years agoMDL-26674 wiki2.0: cleaned wiki event logging patch
Rajesh Taneja [Mon, 27 Feb 2012 02:28:01 +0000 (10:28 +0800)]
MDL-26674 wiki2.0: cleaned wiki event logging patch

9 years agoMerge branch 'wip-MDL-27064-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 19 Mar 2012 02:49:05 +0000 (15:49 +1300)]
Merge branch 'wip-MDL-27064-master' of git://github.com/phalacee/moodle

9 years agoMDL-26674 wiki2.0: Fixed wiki activity log
Diane Villemure [Fri, 24 Feb 2012 08:37:19 +0000 (16:37 +0800)]
MDL-26674 wiki2.0: Fixed wiki activity log

9 years agoMerge branch 'MDL-32004-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 19 Mar 2012 01:37:49 +0000 (14:37 +1300)]
Merge branch 'MDL-32004-master-2' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-32008-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 19 Mar 2012 01:28:06 +0000 (14:28 +1300)]
Merge branch 'MDL-32008-master-2' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-28187_messaging_nav' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 19 Mar 2012 01:14:28 +0000 (14:14 +1300)]
Merge branch 'MDL-28187_messaging_nav' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-31835_recent_conversations' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 19 Mar 2012 01:10:37 +0000 (14:10 +1300)]
Merge branch 'MDL-31835_recent_conversations' of git://github.com/andyjdavis/moodle

9 years agoMDL-19125 upgrade: Fixed typo
Sam Hemelryk [Sun, 18 Mar 2012 22:01:50 +0000 (11:01 +1300)]
MDL-19125 upgrade: Fixed typo

9 years agoMerge branch 'MDL-30890' of git://github.com/rwijaya/moodle
Sam Hemelryk [Sun, 18 Mar 2012 21:28:14 +0000 (10:28 +1300)]
Merge branch 'MDL-30890' of git://github.com/rwijaya/moodle

9 years agoMDL-19125 lib: Fixed up inline comments during integration
Sam Hemelryk [Sun, 18 Mar 2012 21:08:47 +0000 (10:08 +1300)]
MDL-19125 lib: Fixed up inline comments during integration

9 years agoMerge branch 'MDL-19125_module_security' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 18 Mar 2012 21:07:57 +0000 (10:07 +1300)]
Merge branch 'MDL-19125_module_security' of git://github.com/timhunt/moodle

9 years agoMDL-31703 allow serving of JavaScript from unsupported '/' dirroot
Petr Skoda [Sun, 18 Mar 2012 16:28:59 +0000 (17:28 +0100)]
MDL-31703 allow serving of JavaScript from unsupported '/' dirroot

9 years agoMDL-32084 theme_fusion: removed default tagline in frontpage.php and changed configte...
Mary Evans [Sat, 17 Mar 2012 21:33:59 +0000 (21:33 +0000)]
MDL-32084 theme_fusion: removed default tagline in frontpage.php and changed configtextarea to configtext

9 years agoMDL-28187 message: fixed up $PAGE->set_url() in /message/index.php so the nav highlig...
Andrew Davis [Thu, 8 Mar 2012 07:45:45 +0000 (14:45 +0700)]
MDL-28187 message: fixed up $PAGE->set_url() in /message/index.php so the nav highlighted properly

9 years agoMDL-32090 fix invalid group members url
Petr Skoda [Fri, 16 Mar 2012 19:11:23 +0000 (20:11 +0100)]
MDL-32090 fix invalid group members url

Credit goes to Jean-Philippe Gaudreau.

9 years agoMDL-32064 quiz navigation: JS form submit must fire submit event handlers.
Tim Hunt [Thu, 15 Mar 2012 14:24:46 +0000 (14:24 +0000)]
MDL-32064 quiz navigation: JS form submit must fire submit event handlers.

9 years agoMDL-32008 Remove old group deletion code
Andrew Robert Nicols [Mon, 12 Mar 2012 16:39:11 +0000 (16:39 +0000)]
MDL-32008 Remove old group deletion code

9 years agoAutomatically generated installer lang files
AMOS bot [Fri, 9 Mar 2012 10:54:12 +0000 (11:54 +0100)]
Automatically generated installer lang files

9 years agoMDL-32046 show warning that unenrolment of all users is not allowed in non-verbose...
Petr Skoda [Fri, 16 Mar 2012 10:03:31 +0000 (11:03 +0100)]
MDL-32046 show warning that unenrolment of all users is not allowed in non-verbose mode

9 years agoMDL-31835 message: added a view conversation type link after each conversation on...
Andrew Davis [Sat, 3 Mar 2012 06:47:41 +0000 (13:47 +0700)]
MDL-31835 message: added a view conversation type link after each conversation on the recent conversation screen

9 years agoMDL-31594 question manual grading: did not handle comma as decimal.
Tim Hunt [Thu, 15 Mar 2012 18:46:43 +0000 (18:46 +0000)]
MDL-31594 question manual grading: did not handle comma as decimal.

9 years agoMDL-19125 module restrictions: document change in mod/upgrade.txt
Tim Hunt [Thu, 8 Mar 2012 12:00:38 +0000 (12:00 +0000)]
MDL-19125 module restrictions: document change in mod/upgrade.txt

9 years agoMDL-19125 module restrictions: addinstance capabilities for all mods
Tim Hunt [Wed, 7 Mar 2012 16:24:02 +0000 (16:24 +0000)]
MDL-19125 module restrictions: addinstance capabilities for all mods

9 years agoMDL-19125 module restrictions: use a capability
Tim Hunt [Wed, 7 Mar 2012 11:33:50 +0000 (11:33 +0000)]
MDL-19125 module restrictions: use a capability

1. This used to use a complex legacy system which was buggy.

2. It now relies on a new mod/...:addinstance capability for each module.

3. All the legacy code has been stripped out.

4. Old restriction data is upgraded by creating the necessary permission
overrides. Similarly, when old backups are restored, the old settings
are converted to be overrides.

5. The required addinstance capabilities will be added as a separate
commit.

6. There is a developer debug warning about modules that are missing the
addinstance capability, unless they are MOD_ARCHETYPE_SYSTEM mods.

9 years agoweekly release 2.3dev
Eloy Lafuente (stronk7) [Thu, 15 Mar 2012 10:44:35 +0000 (11:44 +0100)]
weekly release 2.3dev

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Thu, 15 Mar 2012 10:41:55 +0000 (11:41 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMDL-30890 accessibility compliance: add summary to calendar table
Rossiani Wijaya [Thu, 15 Mar 2012 08:55:59 +0000 (16:55 +0800)]
MDL-30890 accessibility compliance: add summary to calendar table

9 years agoMDL-27064 - Blog - Changing the link text for different levels of blog entries
Jason Fowler [Fri, 9 Mar 2012 07:08:25 +0000 (15:08 +0800)]
MDL-27064 - Blog - Changing the link text for different levels of blog entries

9 years agoAutomatically generated installer lang files
AMOS bot [Thu, 15 Mar 2012 00:31:47 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMerge branch 'MDL-26243-master' of https://github.com/mackensen/moodle
Eloy Lafuente (stronk7) [Wed, 14 Mar 2012 23:39:17 +0000 (00:39 +0100)]
Merge branch 'MDL-26243-master' of https://github.com/mackensen/moodle

9 years agoMDL-31911 admin tools: moved loop after tools admin category created
Jenny Gray [Tue, 6 Mar 2012 13:30:28 +0000 (13:30 +0000)]
MDL-31911 admin tools: moved loop after tools admin category created

9 years agoMDL-30995 completion: switch one type & name for correctness
Eloy Lafuente (stronk7) [Wed, 14 Mar 2012 17:14:36 +0000 (18:14 +0100)]
MDL-30995 completion: switch one type & name for correctness

9 years agoMDL-28972 formslib: whitespace fixes
Eloy Lafuente (stronk7) [Wed, 14 Mar 2012 17:10:24 +0000 (18:10 +0100)]
MDL-28972 formslib: whitespace fixes

9 years agoMerge branch 'MDL-30995' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 14 Mar 2012 17:07:21 +0000 (18:07 +0100)]
Merge branch 'MDL-30995' of git://github.com/ankitagarwal/moodle

9 years agoMDL-30995 completion: updating PHPdocs as suggested by little smurfs
Ankit Agarwal [Wed, 14 Mar 2012 06:39:36 +0000 (14:39 +0800)]
MDL-30995 completion: updating PHPdocs as suggested by little smurfs

9 years agoMDL-28972 formslib: Fixed up variable naming
Sam Hemelryk [Wed, 14 Mar 2012 01:38:08 +0000 (14:38 +1300)]
MDL-28972 formslib: Fixed up variable naming

9 years agoMerge branch 'wip-mdl-28972' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Wed, 14 Mar 2012 01:40:07 +0000 (14:40 +1300)]
Merge branch 'wip-mdl-28972' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-31853_admin_externalpage_setup' of git://github.com/davosmith/moodle
Aparup Banerjee [Wed, 14 Mar 2012 01:16:27 +0000 (09:16 +0800)]
Merge branch 'MDL-31853_admin_externalpage_setup' of git://github.com/davosmith/moodle

9 years agoMDl-30616 course: Fixed bug with module subtype links
Sam Hemelryk [Wed, 14 Mar 2012 00:52:18 +0000 (13:52 +1300)]
MDl-30616 course: Fixed bug with module subtype links

9 years agoMerge branch 'MDL-29147_insertElementBefore_warning' of git://github.com/davosmith...
Sam Hemelryk [Tue, 13 Mar 2012 22:52:38 +0000 (11:52 +1300)]
Merge branch 'MDL-29147_insertElementBefore_warning' of git://github.com/davosmith/moodle

9 years agoMerge branch 'MDL-30616-master-7' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 22:40:39 +0000 (23:40 +0100)]
Merge branch 'MDL-30616-master-7' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-29440-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 13 Mar 2012 22:29:52 +0000 (11:29 +1300)]
Merge branch 'MDL-29440-master' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-31975_master' of git://github.com/kordan/moodle
Sam Hemelryk [Tue, 13 Mar 2012 22:23:39 +0000 (11:23 +1300)]
Merge branch 'MDL-31975_master' of git://github.com/kordan/moodle

9 years agoMerge branch 'MDL-31169_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Tue, 13 Mar 2012 22:15:13 +0000 (11:15 +1300)]
Merge branch 'MDL-31169_master' of git://github.com/lazydaisy/moodle

9 years agoMDL-31929 minor fixup (the file is plenty, but avoid introducing new ones)
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 21:54:48 +0000 (22:54 +0100)]
MDL-31929 minor fixup (the file is plenty, but avoid introducing new ones)

9 years agoMerge branch 'wip-MDL-31929-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 22:01:11 +0000 (23:01 +0100)]
Merge branch 'wip-MDL-31929-master' of git://github.com/marinaglancy/moodle

9 years agoMDL-28998 libraries: Using default value of 0 for userid during login
Ankit Agarwal [Tue, 13 Mar 2012 05:59:10 +0000 (13:59 +0800)]
MDL-28998 libraries: Using default value of 0 for userid during login

9 years agoMerge branch 'wip-MDL-27405-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 21:35:04 +0000 (22:35 +0100)]
Merge branch 'wip-MDL-27405-m23' of git://github.com/samhemelryk/moodle

9 years agoMDL-27405 navigation: Fixed up buggy array_merge call
Sam Hemelryk [Tue, 13 Mar 2012 21:16:34 +0000 (10:16 +1300)]
MDL-27405 navigation: Fixed up buggy array_merge call

9 years agoMerge branch 'w11_MDL-31790_m23_resetunenrol' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 17:13:52 +0000 (18:13 +0100)]
Merge branch 'w11_MDL-31790_m23_resetunenrol' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-31981' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 17:08:40 +0000 (18:08 +0100)]
Merge branch 'MDL-31981' of git://github.com/timhunt/moodle

9 years agoMDL-31834 message: fixed up some not quite correct usage of moodle/site:readallmessages
Andrew Davis [Thu, 1 Mar 2012 06:53:48 +0000 (13:53 +0700)]
MDL-31834 message: fixed up some not quite correct usage of moodle/site:readallmessages

9 years agoMerge branch 'wip-MDL-31175-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 15:15:02 +0000 (16:15 +0100)]
Merge branch 'wip-MDL-31175-m23' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'w11_MDL-31845_m23_dbenrolcat' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 12:36:48 +0000 (13:36 +0100)]
Merge branch 'w11_MDL-31845_m23_dbenrolcat' of git://github.com/skodak/moodle

9 years agoMDL-31718 add a few more tests to check that lens and tags are properly handled
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 12:13:31 +0000 (13:13 +0100)]
MDL-31718 add a few more tests to check that lens and tags are properly handled

9 years agoMerge branch 'w11_MDL-31718_m23_shortentext' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 13 Mar 2012 11:51:41 +0000 (12:51 +0100)]
Merge branch 'w11_MDL-31718_m23_shortentext' of git://github.com/skodak/moodle

9 years agoMDL-31790 prevent removing of protected role assignments from subcontexts
Petr Skoda [Tue, 13 Mar 2012 11:30:13 +0000 (12:30 +0100)]
MDL-31790 prevent removing of protected role assignments from subcontexts

9 years agoMerge branch 'MDL-31709_message_get_participants' of git://github.com/andyjdavis...
Aparup Banerjee [Tue, 13 Mar 2012 08:54:08 +0000 (16:54 +0800)]
Merge branch 'MDL-31709_message_get_participants' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'wip-MDL-31838-master' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Tue, 13 Mar 2012 08:10:19 +0000 (16:10 +0800)]
Merge branch 'wip-MDL-31838-master' of git://github.com/marinaglancy/moodle

9 years agoMDL-31790 fix incorrect capability
Petr Skoda [Tue, 13 Mar 2012 08:09:04 +0000 (09:09 +0100)]
MDL-31790 fix incorrect capability

9 years agoMerge branch 'master_MDL-31942' of git://github.com/danmarsden/moodle
Aparup Banerjee [Tue, 13 Mar 2012 07:51:53 +0000 (15:51 +0800)]
Merge branch 'master_MDL-31942' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'wip-mdl-27862' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 13 Mar 2012 07:16:30 +0000 (15:16 +0800)]
Merge branch 'wip-mdl-27862' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-31008 themes : fixed up incorrect css typo
Aparup Banerjee [Tue, 13 Mar 2012 07:10:41 +0000 (15:10 +0800)]
MDL-31008 themes : fixed up incorrect css typo

9 years agoMerge branch 'wip-mdl-30817' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 13 Mar 2012 03:45:28 +0000 (11:45 +0800)]
Merge branch 'wip-mdl-30817' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-29745 Fixed white space
Sam Hemelryk [Tue, 13 Mar 2012 03:36:37 +0000 (16:36 +1300)]
MDL-29745 Fixed white space

9 years agoMerge branch 'scorm_graph_report' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 13 Mar 2012 03:35:15 +0000 (16:35 +1300)]
Merge branch 'scorm_graph_report' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-30867' of git://github.com/rwijaya/moodle
Aparup Banerjee [Tue, 13 Mar 2012 03:26:42 +0000 (11:26 +0800)]
Merge branch 'MDL-30867' of git://github.com/rwijaya/moodle

9 years agoMDL-31008 themes : (base theme) reversed MDL-26712 by making dimmed objects grey...
Mary Evans [Sat, 3 Mar 2012 17:38:49 +0000 (17:38 +0000)]
MDL-31008 themes : (base theme) reversed MDL-26712 by making dimmed objects grey and added new rule for dimmed activity label text to give 50% transparancy instead

9 years agoMDL-31910 Quiz : fixed whitespace
Aparup Banerjee [Tue, 13 Mar 2012 02:14:58 +0000 (10:14 +0800)]
MDL-31910 Quiz : fixed whitespace

9 years agoMDL-31910 Quiz : Error on Manual Grading report
M Kassaei [Fri, 9 Mar 2012 17:45:14 +0000 (17:45 +0000)]
MDL-31910 Quiz : Error on Manual Grading report

9 years agoMerge branch 'MDL-31935_search_restore_link' of git://github.com/davosmith/moodle
Aparup Banerjee [Tue, 13 Mar 2012 02:00:33 +0000 (10:00 +0800)]
Merge branch 'MDL-31935_search_restore_link' of git://github.com/davosmith/moodle

9 years agoMDL-22895 scorm: Fixed up issues with graph report
Ankit Agarwal [Tue, 13 Mar 2012 01:28:34 +0000 (09:28 +0800)]
MDL-22895 scorm: Fixed up issues with graph report

9 years agoMerge branch 'MDL-31808-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 13 Mar 2012 01:10:00 +0000 (14:10 +1300)]
Merge branch 'MDL-31808-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-31917-master-1' of git://git.luns.net.uk/moodle
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

9 years agoMerge branch 'MDL-31919-master-2' 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

9 years agoMerge branch 'w11_MDL-31985_m23_lobsizes' of git://github.com/skodak/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

9 years agoMerge branch 'w11_MDL-27457_m23_enrolnorecover' 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

9 years agoMerge branch 'MDL-30298_master' of git://github.com/lazydaisy/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

9 years agoMerge branch 'w11_MDL-31899_m23_mysqlcolumns' of git://github.com/skodak/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

9 years agoMerge branch 'MDL-31702' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 12 Mar 2012 21:34:03 +0000 (10:34 +1300)]
Merge branch 'MDL-31702' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-31362_unused_constant' of git://github.com/andyjdavis/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

9 years agoMerge branch 'w11_MDL-31956_m23_paypal' of git://github.com/skodak/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

9 years agoMDL-31805 html2text - change tests acordingly with the new version
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.

9 years agoMerge branch 'MDL-31979-master' of git://github.com/micaherne/moodle
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

9 years agoMerge branch 'w11_MDL-31805_m23_html2text' of git://github.com/skodak/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

9 years agoMerge branch 'w11_MDL-31595_m23_enrolme' 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

9 years agoMDL-31805 migrate html2text tests from web lib to new location
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).

9 years agoMDL-31595 improve enrol link comments
Petr Skoda [Mon, 12 Mar 2012 15:47:28 +0000 (16:47 +0100)]
MDL-31595 improve enrol link comments