Commit graph

48080 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
260dd13064 Merge branch 'wip-MDL-27825-master' of git://github.com/samhemelryk/moodle 2011-06-14 12:32:47 +02:00
Eloy Lafuente (stronk7)
e298ec5162 Merge branch 'MDL-27525' of git://github.com/rwijaya/moodle 2011-06-14 12:11:54 +02:00
Kordan
db3b8953ce MDL-27835_for_master fix 2011-06-14 11:04:39 +02:00
Sam Hemelryk
e625feaf0b MDL-27825 Improved check of themedesignermode to prevent errors if it isn't set 2011-06-14 15:48:10 +08:00
Eloy Lafuente (stronk7)
9b9d7a6039 MDL-27552 whitespace fixes 2011-06-14 08:55:06 +02:00
Rajesh Taneja
b4e29077d3 MDL-27759 Fixed conflicts for integration 2011-06-14 10:45:03 +08:00
Rajesh Taneja
ccc77f9152 MDL-27759 user webservice - added new PARAM for timezone PARAM_TIMEZONE, to validate timezone input in webservice while deling with user information 2011-06-14 10:15:00 +08:00
Sam Hemelryk
0e36d0cdf5 Merge branch 'MDL-27834' of git://github.com/kordan/moodle 2011-06-14 09:52:39 +08:00
Sam Hemelryk
f74415b926 Merge branch 'MDL-27286_master' of git://github.com/stronk7/moodle 2011-06-14 09:47:52 +08:00
Sam Hemelryk
650142bb9b Merge branch 's11_MDL-27497_upload_master' of github.com:dongsheng/moodle 2011-06-14 09:43:24 +08:00
Sam Hemelryk
d8f85b6e8b Merged branch 's11_MDL-27552_token_master' of git@github.com:dongsheng/moodle.git with changes 2011-06-14 09:32:44 +08:00
Eloy Lafuente (stronk7)
25b4558c40 MDL-27822 rename new methods 2011-06-14 00:33:16 +02:00
Tim Hunt
be7b29eff6 MDL-27822 old module version should be available in restore_activity_structure_step::define_structure() 2011-06-14 00:30:30 +02:00
Eloy Lafuente (stronk7)
a0be4a1fcb Merge branch 'MDL-27065-workshop-categories' of git://github.com/mudrd8mz/moodle 2011-06-13 19:52:49 +02:00
Eloy Lafuente (stronk7)
ad08c5632e MDL-27286 recent files repo - fix for oracle and cleanup 2011-06-13 18:52:39 +02:00
Kordan
b2d606a4e3 MDL-27834 fix 2011-06-13 14:49:26 +02:00
Eloy Lafuente (stronk7)
269c173e81 whitespace fixes 2011-06-13 12:21:48 +02:00
Dongsheng Cai
13ea96c40b MDL-27552 get webservice token by providing username and password 2011-06-13 17:41:56 +08:00
David Mudrak
85fbe3fdcf MDL-27811 Fixed incorrect qtype_essay conversion 2011-06-13 11:11:31 +02:00
Sam Hemelryk
46d3b9be73 Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes 2011-06-13 16:54:52 +08:00
Eloy Lafuente (stronk7)
379f39eb9f Merge branch 'MDL-27789-qe2plugins' of git://github.com/mudrd8mz/moodle 2011-06-13 10:12:03 +02:00
Dongsheng Cai
42b2809ff3 MDL-27497, using webservice token to upload files 2011-06-13 16:06:18 +08:00
Aparup Banerjee
486e889262 MDL-27446 Backup - added answers 'jumpto' conversion to moodle1 converter for
lesson
2011-06-13 10:02:28 +02:00
Sam Hemelryk
12aafa8769 Merge branch 'master_MDL-272522' of git://github.com/danmarsden/moodle 2011-06-13 15:49:24 +08:00
Sam Hemelryk
f44c912bd0 Merge branch 'MDL-26147-workshop-ignore-deadlines' of git://github.com/mudrd8mz/moodle 2011-06-13 15:32:44 +08:00
Sam Hemelryk
0723dcab40 Merged branch 'MDL-26960' of git://git.luns.net.uk/moodle with changes 2011-06-13 15:06:19 +08:00
Sam Hemelryk
aa8ec18b52 Merge branch 'master_MDL-27404' of git://github.com/danmarsden/moodle 2011-06-13 14:53:37 +08:00
Sam Hemelryk
16c2d2c1b4 Merge branch 'MDL-26774-wip' of git://github.com/mouneyrac/moodle 2011-06-13 14:11:58 +08:00
Sam Hemelryk
fcc871181f Merge branch 'MDL-27399' of git://github.com/mouneyrac/moodle 2011-06-13 14:04:28 +08:00
Sam Hemelryk
a7b7c2d3db Merge branch 'MDL-20538' of git://github.com/timhunt/moodle 2011-06-13 11:22:51 +08:00
Sam Hemelryk
355871acd5 Merge branch 'MDL-27757-HEAD' of git://github.com/srynot4sale/moodle 2011-06-13 11:17:59 +08:00
Sam Hemelryk
89b2cdb28a Merge branch 'MDL-27783' of git://github.com/mouneyrac/moodle 2011-06-13 11:13:29 +08:00
Sam Hemelryk
178ac9033b Merged branch 'MDL-27781' of git://github.com/mouneyrac/moodle.git with changes 2011-06-13 10:54:24 +08:00
Rossiani Wijaya
6ff768a67f MDL-27525 mod_wiki: Fixed typing error for the variable and assign the value contextid to use mod context id 2011-06-13 10:54:07 +08:00
Sam Hemelryk
85ee4e350c Merge branch 'MDL-27792-plugin-subsystem' of git://github.com/mudrd8mz/moodle 2011-06-13 10:39:32 +08:00
Sam Hemelryk
954adfc923 Merged branch 'MDL-27801' of git://github.com/kordan/moodle.git with changes 2011-06-13 10:33:39 +08:00
Dan Marsden
d1e3b5c2d3 MDL-27404 SCORM fix for IE 6 - thanks to Howard Miller 2011-06-13 11:32:26 +12:00
Dan Marsden
2875714e4a MDL-27522 SCORM tidy up commit 2011-06-13 11:00:43 +12:00
Ankit Kumar Agarwal
b4baa7faa3 MDL-27522 SCORM - seperate user report from main report page to allow better re-use in preparation for MDL-27256 2011-06-13 10:21:40 +12:00
David Mudrak
9ddff589df MDL-26147 workshop - added capability to ignore time restrictions 2011-06-10 19:01:27 +02:00
David Mudrak
a74cadfa77 MDL-27065 workshop grades categories can be defined in mod_form
Because the Workshop module creates two grade items in the gradebook, we
can't use standard modedit features to set the corresponding category in
the gradebook (it supports single grade item only).

The patch also cleans the mod_form.php so that it does not use the
global $COURSE (just because I do not like this global variable).

And for the record - QuickForms must die.
2011-06-10 16:48:09 +02:00
David Mudrak
b7119f4f3f MDL-22414 Exclude unsupported modules from the course contents 2011-06-10 09:01:41 +02:00
Andrew Davis (andyjdavis)
35d725627c MDL-26105 blocks: added use of user friendly block settings to messaging 2011-06-10 13:52:53 +08:00
Marina Glancy
13b3f4d4af MDL-26430 fixed appearance of one html form within another 2011-06-10 12:55:12 +08:00
Aaron Barnes
7075e37e0c MDL-27757 lib/completionlib.php: Load "enablecompletion" property if required 2011-06-10 13:58:41 +12:00
kordan
b0f37206c6 fix MDL-27801 2011-06-09 21:47:09 +02:00
Tim Hunt
55190d7e2c MDL-20538 get rid of badly name-spaced constants from lib/questionlib.php.
Unfortunately, they are used all over the import/export code, so I cannot eliminate them completely. However, I was able to move them out of the core library.
2011-06-09 19:27:36 +01:00
David Mudrak
a0166f5507 MDL-27792 Fixed missing core subsystem 2011-06-09 16:19:51 +02:00
Dan Poltawski
a8134ff68b messaging: MDL-26960 Check correct users permissions
When on message profile page, the incorrect capability was checked
2011-06-09 15:18:43 +01:00
David Mudrak
d1c77ac372 MDL-27789 The new question plugins reported as standard ones 2011-06-09 14:29:27 +02:00