Eloy Lafuente (stronk7)
daf4cf26f7
Merge branch 'MDL-27929' of git://github.com/timhunt/moodle
2011-06-23 00:51:16 +02:00
Tim Hunt
35d5f1c28d
MDL-27948 The question engine should use recordsets to load attempt data
...
This should be good for performance (memory usage). It also avoids having to construct a meaningless, unique, first column, which is a pain on MyQSL.
2011-06-22 18:53:15 +01:00
Tim Hunt
2fa66bdf71
MDL-27929 question_attempts.minfraction should be signed!
2011-06-22 18:48:05 +01:00
Eloy Lafuente (stronk7)
01acbc42e1
Merge branch 'MDL-27073_multilang-custommenu' of git://github.com/mudrd8mz/moodle
2011-06-22 14:11:18 +02:00
Sam Hemelryk
115910dccd
Merge branch 'MDL-27966_master' of git://github.com/stronk7/moodle
2011-06-22 17:15:10 +08:00
Andrew Davis (andyjdavis)
b822fc8511
MDL-27829 blocks: added some brains to generate_page_type_patterns() so that it can handle special cases like course reports
2011-06-22 17:01:21 +08:00
Eloy Lafuente (stronk7)
ea1e73843b
MDL-27966 timezones - updated to 2011g version + fix minor notice
2011-06-21 16:23:24 +02:00
Sam Hemelryk
6708a1f525
MDL-27810 portfolio: Added ->portfolioenabled checks before creating portfolio buttons to avoid initialising portfolio requirements
2011-06-21 10:35:53 +08:00
Eloy Lafuente (stronk7)
ca31e935e6
Merge branch 'wip-MDL-27899-master' of git://github.com/samhemelryk/moodle
2011-06-20 18:38:42 +02:00
Eloy Lafuente (stronk7)
6f9297b48b
Merge branch 'MDL-27915' of git://github.com/timhunt/moodle
2011-06-20 12:39:19 +02:00
Eloy Lafuente (stronk7)
ee37607188
Merge branch 'MDL-27925' of git://github.com/timhunt/moodle
2011-06-20 11:56:34 +02:00
Sam Hemelryk
0ebb526f85
MDL-27899 Moved initialise_fullme during setup to after sam has been initialised
2011-06-20 17:40:03 +08:00
Dongsheng Cai
ea4e96c248
MDL-27880
...
1. moodle_user_get_course_participants_by_id web service to get user details in course context
2. Fixed the proformance issues of get_users_by_id web service
2011-06-20 13:46:47 +08:00
Tim Hunt
01d203566f
MDL-27925 Give meaningful keys to all the standard navigation mod settings nodes.
2011-06-18 16:24:31 +01:00
Tim Hunt
0c2f94e081
MDL-27925 A way to get the all the keys of the child nodes of a node.
2011-06-18 16:23:53 +01:00
Tim Hunt
d610cb8980
MDL-27915 improved debuginfo for some file exceptions.
2011-06-17 19:46:09 +01:00
Eloy Lafuente (stronk7)
faf1f957ac
Merge branch 'MDL-27490' of git://github.com/timhunt/moodle
2011-06-17 17:24:51 +02:00
Tim Hunt
fde4560dae
MDL-27490 Implement a manage question behaviours admin page
...
While doing this, I found various bugs in the manages question types admin page, and so fixed them, and updated the code
there to use $OUTPUT and html_writer.
AMOS BEGIN
MOV [cannotdeletemissingqtype,admin],[cannotdeletemissingqtype,question]
MOV [cannotdeleteqtypeinuse,admin],[cannotdeleteqtypeinuse,question]
MOV [cannotdeleteqtypeneeded,admin],[cannotdeleteqtypeneeded,question]
MOV [deleteqtypeareyousure,admin],[deleteqtypeareyousure,question]
MOV [deleteqtypeareyousuremessage,admin],[deleteqtypeareyousuremessage,question]
MOV [deletingqtype,admin],[deletingqtype,question]
MOV [numquestions,admin],[numquestions,question]
MOV [numquestionsandhidden,admin],[numquestionsandhidden,question]
MOV [qtypedeletefiles,admin],[qtypedeletefiles,question]
MOV [uninstallqtype,admin],[uninstallqtype,question]
AMOS END
2011-06-17 16:21:32 +01:00
David Mudrak
87e0230d0a
MDL-27073 Support multi-language content in custom menu
2011-06-17 17:08:33 +02:00
Eloy Lafuente (stronk7)
ff30976ad5
Merge branch 'MDL-27887' of git://github.com/timhunt/moodle
2011-06-17 16:16:58 +02:00
Eloy Lafuente (stronk7)
5017d4dc7d
Merge branch 'MDL-27878' of git://github.com/timhunt/moodle
2011-06-17 15:30:16 +02:00
Tim Hunt
cfcf9bb4e3
MDL-27897 moodle_database::get_in_or_equal must not use a static variable.
...
It makes unit testing impossible. Switch to a field.
2011-06-17 11:26:51 +01:00
Aparup Banerjee
cec76330fe
MDL-27500 editor - updated plugin version references, thirdparty version reference and tinymce upgrade readme
2011-06-17 16:52:57 +08:00
Eloy Lafuente (stronk7)
33865a7812
MDL-27500 HTML Editor - deleted 3.3.9.2 build
2011-06-17 01:10:15 +02:00
Eloy Lafuente (stronk7)
7035b80ad9
Merge branch 'MDL-27500' of git://github.com/nebgor/moodle
2011-06-17 01:06:07 +02:00
Tim Hunt
a8c8641802
MDL-27887 In developer debug, use uncompressed TinyMCE code.
2011-06-16 18:59:41 +01:00
Tim Hunt
6481b28fe5
MDL-27878 make progress bars fail explicity if you forget to call create().
2011-06-16 18:55:29 +01:00
Andrew Davis (andyjdavis)
0f63f2714f
MDL-26105 blocks: made the block settings help icons work
2011-06-16 12:05:53 +02:00
Andrew Davis (andyjdavis)
84a1bea972
MDL-26105 blocks: readded the my moodle page's page type list generator function
2011-06-16 12:05:48 +02:00
Eloy Lafuente (stronk7)
07c4c12b80
Merge branch 'wip-mdl-27863-master' of git://github.com/rajeshtaneja/moodle
2011-06-15 11:25:09 +02:00
Rajesh Taneja
42ab2b70a4
MDL-27863 moodlelib - fixed testcase faliure in MDL-27577
2011-06-15 16:34:52 +08:00
Eloy Lafuente (stronk7)
4a9e5fbe91
MDL-27759 fix whitespace
2011-06-14 17:01:20 +02:00
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
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
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
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)
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
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
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
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