55129 Commits

Author SHA1 Message Date
Dan Poltawski
bdaff201bb Merge branch 'MDL-34226' of git://github.com/timhunt/moodle 2012-07-23 13:53:46 +08:00
Rajesh Taneja
dc9fa9cbb9 MDL-34148 Blog: Fixed variable name used for saving module name
Updated Erik's patch to match coding style
2012-07-23 13:43:52 +08:00
Erik Lundberg
4eaf120a83 MDL-34148: Instead of using the module name from the filesystem, the blog menu now fetches the module name with get_string(). 2012-07-23 13:43:52 +08:00
Dan Poltawski
a5c8e33122 Merge branch 'wip-mdl-32945' of git://github.com/rajeshtaneja/moodle 2012-07-23 13:35:24 +08:00
Dan Poltawski
db68bd4435 Merge branch 'wip-MDL-34404-m24' of git://github.com/samhemelryk/moodle 2012-07-23 13:25:26 +08:00
Dan Poltawski
89061ad4c0 Merge branch 'wip-mdl-31031' of git://github.com/rajeshtaneja/moodle 2012-07-23 13:21:37 +08:00
Dan Poltawski
6c2be9039b MDL-31023 upgrade.txt: Note to upgrade.txt about pagelib removals 2012-07-23 13:18:06 +08:00
Dan Poltawski
7067a161a3 Merge branch 'wip-mdl-31023' of git://github.com/rajeshtaneja/moodle 2012-07-23 13:13:47 +08:00
Rajesh Taneja
f55cf492eb MDL-31031 messages: deprecated message_get_my_providers function to be removed in 2.5 2012-07-23 13:06:07 +08:00
Dan Poltawski
db9d24a1cd Merge branch 'w30_MDL-34396_m24_loginhttpsspell' of git://github.com/skodak/moodle 2012-07-23 12:19:56 +08:00
Dan Poltawski
ed25f64642 Merge branch 'wip-mdl-30651' of git://github.com/rajeshtaneja/moodle 2012-07-23 11:22:06 +08:00
Aparup Banerjee
d829f5c6fd Merge branch 'MDL-32665_chat_popup' of git://github.com/andyjdavis/moodle 2012-07-23 10:17:55 +08:00
Sam Hemelryk
395b805f97 Merge branch 'MDL-34225' of git://github.com/nebgor/moodle 2012-07-23 14:04:09 +12:00
Sam Hemelryk
27ceaf09cc MDL-19430 block_course_overview: Fixed up whitespace 2012-07-23 14:02:27 +12:00
Sam Hemelryk
9e50c8d1e7 Merge branch 'w30_MDL-33180_m24_simpletest' of git://github.com/skodak/moodle
Conflicts:
	version.php
2012-07-23 13:39:11 +12:00
Sam Hemelryk
f3c3a84280 MDL-19430 block_course_overview: post integration clean up 2012-07-23 13:36:46 +12:00
Sam Hemelryk
4c21d0da95 Merge branch 'wip-mdl-19430' of git://github.com/rajeshtaneja/moodle 2012-07-23 13:36:45 +12:00
Dan Poltawski
fe56f5bc11 Merge branch 'MDL-34451' of git://github.com/merrill-oakland/moodle 2012-07-23 09:22:40 +08:00
Sam Hemelryk
409300ad42 MDL-34205 modchooser: Bumped version number after new setting added 2012-07-23 12:53:11 +12:00
Sam Hemelryk
18989c7a24 Merge branch 'MDL-34205-master' of git://github.com/micaherne/moodle 2012-07-23 12:52:35 +12:00
Sam Hemelryk
df49074771 Merge branch 'MDL-24298-master' of git://github.com/micaherne/moodle 2012-07-23 12:48:46 +12:00
Sam Hemelryk
11946cada0 Merge branch 'MDL-34412_master' of git://github.com/lazydaisy/moodle 2012-07-23 12:42:23 +12:00
Sam Hemelryk
97918ad586 Merge branch 'MDL-34370_master' of git://github.com/lazydaisy/moodle 2012-07-23 12:40:08 +12:00
Sam Hemelryk
dedf660f86 Merge branch 'wip-MDL-34428-master' of git://github.com/marinaglancy/moodle 2012-07-23 12:37:40 +12:00
Sam Hemelryk
a7b2d08727 Merge branch 'MDL-33560-master' of git://github.com/FMCorz/moodle 2012-07-23 12:25:31 +12:00
Jean-Philippe Gaudreau
dacd5daa7a MDL-31516 Fixing grade_edit_tree::format_number 2012-07-23 12:21:50 +12:00
Sam Hemelryk
fc994304a2 Merge branch 'wip-MDL-34221-master' of git://github.com/marinaglancy/moodle 2012-07-23 12:08:15 +12:00
Sam Hemelryk
87608b34f4 Merge branch 'MDL-33927_enforce_max_attachments' of git://github.com/davosmith/moodle 2012-07-23 12:00:30 +12:00
Sam Hemelryk
6d8b85ff82 Merge branch 'MDL-29563_master' of https://github.com/dmonllao/moodle 2012-07-23 11:49:57 +12:00
Jason Ilicic
e0e903291a MDL-34427: Corrected language string when not allowed to enter the chat room. 2012-07-23 11:40:37 +12:00
Sam Hemelryk
f49eff005e Merge branch 'master_MDL-34374' of git://github.com/danmarsden/moodle 2012-07-23 11:38:19 +12:00
Sam Hemelryk
ce4182a46a Merge branch 'master_MDL-34233' of git://github.com/danmarsden/moodle 2012-07-23 11:26:59 +12:00
Sam Hemelryk
c41e682c27 Merge branch 'MDL-34313' of git://github.com/netspotau/moodle-mod_assign 2012-07-23 11:22:17 +12:00
Sam Hemelryk
1d434a6d17 Merge branch 'MDL-34272' of git://github.com/netspotau/moodle-mod_assign 2012-07-23 11:20:28 +12:00
Sam Hemelryk
5b2b9e04ef Merge branch 'MDL-34256' of git://github.com/netspotau/moodle-mod_assign 2012-07-23 11:09:28 +12:00
Sam Hemelryk
d817a9e52e Merge branch 'MDL-34067' of git://github.com/netspotau/moodle-mod_assign 2012-07-23 11:07:30 +12:00
Sam Hemelryk
f3a6fa396e Merge branch 'MDL-2283' of git://github.com/netspotau/moodle-mod_assign 2012-07-23 10:54:55 +12:00
Sam Hemelryk
30a47aea87 Merge branch 'MDL-34265-master' of git://github.com/ankitagarwal/moodle 2012-07-23 10:39:56 +12:00
Sam Hemelryk
d9416fba03 Merge branch 'MDL-34322-master-1' of git://git.luns.net.uk/moodle 2012-07-23 09:43:17 +12:00
Sam Hemelryk
9df815068c MDL-34243 completion: Fixed up call to completion_criteria::factory that was passing object 2012-07-23 09:38:28 +12:00
Sam Hemelryk
8afee51adb Merge branch 'MDL-34243' of git://github.com/srynot4sale/moodle 2012-07-23 09:37:29 +12:00
Mary Evans
1febf3b138 MDL-34370 theme_fusion: added CSS in style/core.css to enable weeks to be moved when editing 2012-07-22 17:55:59 +01:00
Eric Merrill
478067dbfb MDL-34451 quiz Fixed problem where attempt page is updated for ALL attempts, not just current. 2012-07-22 12:22:28 -04:00
Luke Tucker
8bc4a6528f MDL-34396 Ensure TinyMCE editor spell checking works on pages with $PAGE->https_required() 2012-07-21 20:29:20 +02:00
Petr Škoda
c8b3346cfd MDL-33180 delete the last traces of SimpleTest - ciao and thanks 2012-07-21 10:11:50 +02:00
Mary Evans
4470ad0950 MDL-34412 theme_afterburner: defined #EEE as background-color in afterburner_styles.css for filemanager and filepicker input, select, button & textarea 2012-07-20 23:12:06 +01:00
Marina Glancy
c4b64a064a MDL-34428 Private files repository should have a 'manage' link 2012-07-20 13:32:47 +08:00
Marina Glancy
c81f332876 MDL-34221 disabledIf support for filemanager and filepicker elements 2012-07-20 10:49:30 +08:00
Davo Smith
b1c669a711 MDL-34221 Filepicker - disableIf now prevents drag and drop upload 2012-07-20 10:49:30 +08:00
Frederic Massart
6aa3aabe95 MDL-33560 Enrol: Enrol password can be unmasked 2012-07-20 09:00:39 +08:00