Commit graph

52552 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
b39877ef10 Merge branch 'w11_MDL-31790_m23_resetunenrol' of git://github.com/skodak/moodle 2012-03-13 18:13:52 +01:00
Eloy Lafuente (stronk7)
9b89dc4f7d Merge branch 'MDL-31981' of git://github.com/timhunt/moodle 2012-03-13 18:08:40 +01:00
Andrew Davis
48e03792ca MDL-31834 message: fixed up some not quite correct usage of moodle/site:readallmessages 2012-03-13 16:44:19 +01:00
Eloy Lafuente (stronk7)
e4db653e3a Merge branch 'wip-MDL-31175-m23' of git://github.com/samhemelryk/moodle 2012-03-13 16:15:02 +01:00
Eloy Lafuente (stronk7)
65fc03100d Merge branch 'w11_MDL-31845_m23_dbenrolcat' of git://github.com/skodak/moodle 2012-03-13 13:36:48 +01:00
Eloy Lafuente (stronk7)
7ca5dd85dc MDL-31718 add a few more tests to check that lens and tags are properly handled 2012-03-13 13:13:31 +01:00
Eloy Lafuente (stronk7)
45c41bdc06 Merge branch 'w11_MDL-31718_m23_shortentext' of git://github.com/skodak/moodle 2012-03-13 12:51:41 +01:00
Petr Skoda
5b8a9d1329 MDL-31790 prevent removing of protected role assignments from subcontexts 2012-03-13 12:30:13 +01:00
Ruslan Kabalin
0ea0a175da MDL-32027 messaging: Remove remains of old installation method
Since MDL-17457 installation is done using db/install.php
2012-03-13 11:17:35 +00:00
Aparup Banerjee
fed36d5077 Merge branch 'MDL-31709_message_get_participants' of git://github.com/andyjdavis/moodle 2012-03-13 16:54:08 +08:00
Aparup Banerjee
66da1ab0ce Merge branch 'wip-MDL-31838-master' of git://github.com/marinaglancy/moodle 2012-03-13 16:10:19 +08:00
Petr Skoda
35c89e5e87 MDL-31790 fix incorrect capability 2012-03-13 09:09:04 +01:00
Aparup Banerjee
42c8e4d66d Merge branch 'master_MDL-31942' of git://github.com/danmarsden/moodle 2012-03-13 15:51:53 +08:00
Aparup Banerjee
387fb66fd9 Merge branch 'wip-mdl-27862' of git://github.com/rajeshtaneja/moodle 2012-03-13 15:16:30 +08:00
Aparup Banerjee
1fdd48c37f MDL-31008 themes : fixed up incorrect css typo 2012-03-13 15:10:41 +08:00
Aparup Banerjee
c20cb1bab1 Merge branch 'wip-mdl-30817' of git://github.com/rajeshtaneja/moodle 2012-03-13 11:45:28 +08:00
Sam Hemelryk
c8c00cee80 MDL-29745 Fixed white space 2012-03-13 16:36:37 +13:00
Sam Hemelryk
a28c6b40fe Merge branch 'scorm_graph_report' of git://github.com/ankitagarwal/moodle 2012-03-13 16:35:15 +13:00
Aparup Banerjee
f3c5d3102d Merge branch 'MDL-30867' of git://github.com/rwijaya/moodle 2012-03-13 11:26:42 +08:00
Mary Evans
5e5ebb39cf 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 2012-03-13 10:57:16 +08:00
Aparup Banerjee
6a0d8209d1 MDL-31910 Quiz : fixed whitespace 2012-03-13 10:15:05 +08:00
M Kassaei
137d60b66f MDL-31910 Quiz : Error on Manual Grading report 2012-03-13 10:13:27 +08:00
Aparup Banerjee
e281281b84 Merge branch 'MDL-31935_search_restore_link' of git://github.com/davosmith/moodle 2012-03-13 10:00:33 +08:00
Ankit Agarwal
e2f6cb436a MDL-22895 scorm: Fixed up issues with graph report 2012-03-13 09:31:01 +08:00
Sam Hemelryk
db6d54c337 Merge branch 'MDL-31808-master-1' of git://git.luns.net.uk/moodle 2012-03-13 14:10:00 +13:00
Sam Hemelryk
fd9dbadb15 Merge branch 'MDL-31917-master-1' of git://git.luns.net.uk/moodle 2012-03-13 14:04:44 +13:00
Sam Hemelryk
595dc849dd Merge branch 'MDL-31919-master-2' of git://git.luns.net.uk/moodle 2012-03-13 14:00:41 +13:00
Eloy Lafuente (stronk7)
b20bb8454a Merge branch 'w11_MDL-31985_m23_lobsizes' of git://github.com/skodak/moodle 2012-03-13 00:15:59 +01:00
Sam Hemelryk
820a80f903 Merge branch 'w11_MDL-27457_m23_enrolnorecover' of git://github.com/skodak/moodle 2012-03-13 12:00:08 +13:00
Sam Hemelryk
397ee19727 Merge branch 'MDL-30298_master' of git://github.com/lazydaisy/moodle 2012-03-13 11:55:54 +13:00
Eloy Lafuente (stronk7)
403ff1b8ff Merge branch 'w11_MDL-31899_m23_mysqlcolumns' of git://github.com/skodak/moodle 2012-03-12 23:16:27 +01:00
Sam Hemelryk
80fa598515 Merge branch 'MDL-31702' of git://github.com/timhunt/moodle 2012-03-13 10:34:03 +13:00
Sam Hemelryk
3108b6412c Merge branch 'MDL-31362_unused_constant' of git://github.com/andyjdavis/moodle 2012-03-13 10:10:36 +13:00
Eloy Lafuente (stronk7)
e4ccd85f3a Merge branch 'w11_MDL-31956_m23_paypal' of git://github.com/skodak/moodle 2012-03-12 21:36:36 +01:00
Eloy Lafuente (stronk7)
649fd88d8f 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.
2012-03-12 21:17:22 +01:00
Eloy Lafuente (stronk7)
39115a4fee Merge branch 'MDL-31979-master' of git://github.com/micaherne/moodle 2012-03-12 20:18:09 +01:00
Eloy Lafuente (stronk7)
89a47fcc4e Merge branch 'w11_MDL-31805_m23_html2text' of git://github.com/skodak/moodle 2012-03-12 18:04:55 +01:00
Eloy Lafuente (stronk7)
f0131f57d9 Merge branch 'w11_MDL-31595_m23_enrolme' of git://github.com/skodak/moodle 2012-03-12 18:00:23 +01:00
Ruslan Kabalin
0210ce1007 MDL-32009 messaging: Add message processor uninstall functionality 2012-03-12 16:39:51 +00:00
Ruslan Kabalin
6f4f0b5228 MDL-32009 messaging: Add is_enabled method to plugintype_message 2012-03-12 16:39:35 +00:00
Ruslan Kabalin
26d859e0ec MDL-32009 messaging: Refator get_settings_url plugintype method
No need to duplicate checks since we have them in one place.
2012-03-12 16:39:04 +00:00
Petr Skoda
b226ef619f 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).
2012-03-12 17:18:55 +01:00
Petr Skoda
39ec18db5b MDL-31595 improve enrol link comments 2012-03-12 16:47:28 +01:00
Eloy Lafuente (stronk7)
c9a16202d7 Merge branch 'w11_MDL-31815_m23_confirmemail' of git://github.com/skodak/moodle 2012-03-12 16:33:27 +01:00
Eloy Lafuente (stronk7)
ccd7a793ee Merge branch 'w11_MDL-31534_m23_pageinitroot' of git://github.com/skodak/moodle 2012-03-12 15:49:04 +01:00
Andrew Robert Nicols
950a11e8df MDL-32004 Set the defaultrequestcategory correctly when deleting/creating the default category 2012-03-12 13:15:25 +00:00
Petr Skoda
98054db10b MDL-31534 init PAGE before require_login() 2012-03-12 13:58:01 +01:00
Eloy Lafuente (stronk7)
bf0233fb7b Merge branch 'w11_MDL-31494_m23_adodblink' of git://github.com/skodak/moodle 2012-03-12 13:38:30 +01:00
Eloy Lafuente (stronk7)
05386929de Merge branch 'w11_MDL-29514_m23_enum' of git://github.com/skodak/moodle 2012-03-12 12:47:56 +01:00
Mary Evans
180bf7d494 MDL-30298 report_progress: adds outer wrapper with class no-overflow to report table so as to enable horizontal scroll bar 2012-03-12 10:37:35 +00:00