Eloy Lafuente (stronk7)
90333a972e
Merge branch 'wip-mdl-27759-integration-master' of git://github.com/rajeshtaneja/moodle
2011-06-14 16:57:36 +02:00
Eloy Lafuente (stronk7)
b0635db229
Merge branch 'MDL-25461-lang-install-link' of git://github.com/mudrd8mz/moodle
2011-06-14 16:43:07 +02:00
Tim Hunt
98a3898efc
MDL-27849 fix qtype_multianswer attempt data restore (2.1 -> 2.1).
...
Also, refactor calculatedmulti restore to avoid duplication.
2011-06-14 15:17:50 +01:00
David Mudrak
07ec4f650b
MDL-27708 Fixed the version of language packs to install in 2.1
2011-06-14 13:55:27 +02:00
David Mudrak
da84821329
MDL-25461 Installing a language pack is recorded in moodle.org statistics
...
This patch fixes the URLs for fetching data from download.moodle.org so
that the requests are recorded in statistics collector download.php.
Note that we do not record fetching languages.md5 as we want to
record the real .zip downloads only.
2011-06-14 13:49:09 +02:00
Tim Hunt
5b64e32645
MDL-27585 implement restore of qtype_calculatedmulti 2.1 attempt data
2011-06-14 12:11:23 +01:00
Tim Hunt
18ab06bac5
MDL-27639 restore of attempt data from 2.0 - first attempt.
...
This is now at the stage where it mostly appears to work, at lease on
one backup file.
2011-06-14 12:11:19 +01:00
Tim Hunt
b8882c1334
MDL-27639 add two missing language strings.
...
Without these strings, important information for debugging is not displayed.
2011-06-14 12:10:27 +01:00
Tim Hunt
cee74600fa
MDL-27839 supply default qtype_essay_options if they are not present in the XML.
2011-06-14 12:10:25 +01:00
Tim Hunt
d7ad6ac4ef
MDL-27787 Fix restore of matching quetsions backed up from Moodle 2.0.
2011-06-14 12:10:23 +01:00
Eloy Lafuente (stronk7)
7a5f3a3cc7
MDL-27844 files support added to get_users_by_id()
2011-06-14 12:41:51 +02:00
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
