11593 Commits

Author SHA1 Message Date
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
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
Aaron Barnes
7075e37e0c MDL-27757 lib/completionlib.php: Load "enablecompletion" property if required 2011-06-10 13:58:41 +12: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
Andrew Davis (andyjdavis)
fb794ab73c MDL-26105 blocks: fixed some php errors and made a help string better 2011-06-09 17:03:27 +08:00
Jerome Mouneyrac
02ae44cf4e MDL-27783 enabled status of a built-in service should never been updated on upgrade. It is only used during the installation. If a dev really needs to change the status, he can do it in lib/db/upgrade.php 2011-06-09 16:50:14 +08:00
Jerome Mouneyrac
f2806b9a65 MDL-27399 Add all the new mobile ws functions to the built-in mobile service 2011-06-09 15:19:58 +08:00
Jerome Mouneyrac
565e477184 MDL-27781 remove Undefined property: stdClass:: during installation with cli script 2011-06-09 15:08:03 +08:00
Sam Hemelryk
32a510de4e MDL-26105 block setting, improvement, replace switch-case with get_core_subsystems + get_plugin_types 2011-06-09 13:51:14 +08:00
Dongsheng Cai
b1627a92e5 MDL-26105 Block settings should contains less options, and be more user friendly
AMOS BEGIN
    MOV [page-blog-index, pagetype], [page-blog-index, blog]
    MOV [page-blog-x, pagetype], [page-blog-x, blog]
    MOV [page-tag-x, pagetype], [page-tag-x, tag]
    MOV [page-course-view-weeks, pagetype], [page-course-view-weeks, format_weeks]
    MOV [page-course-view-weeks-x, pagetype], [page-course-view-weeks-x, format_weeks]
    MOV [page-course-view-topics, pagetype], [page-course-view-topics, format_topics]
    MOV [page-course-view-topics-x, pagetype], [page-course-view-topics-x, format_topics]
AMOS END
2011-06-09 13:51:14 +08:00
Eloy Lafuente (stronk7)
2cb791ebc5 Merge branch 'wip-mdl-27577-master' of git://github.com/rajeshtaneja/moodle 2011-06-09 00:59:11 +02:00
Sam Hemelryk
00a33dcbac Merged branch 'MDL-26777-wip' of git://github.com/mouneyrac/moodle.git 2011-06-08 17:52:59 +08:00
Sam Hemelryk
96e0194c05 Merged branch 'MLD-27551' of git://github.com/mouneyrac/moodle.git with changes 2011-06-08 17:34:17 +08:00
Sam Hemelryk
0b8dea80dc Merge branch 'MDL-27747' of git://github.com/timhunt/moodle 2011-06-08 17:09:05 +08:00
Sam Hemelryk
f6bd0b9e39 Merged branch 'MDL-27695' of git://github.com/nebgor/moodle.git with changes 2011-06-08 16:25:57 +08:00
Jerome Mouneyrac
b4c74367a3 MDL-26774 fix web service function moodle_user_get_users_by_id. It now matches viewing profile / editing profile. It suppose to work for current user / other user / admin. It is not returning the information of course profile. 2011-06-08 16:07:12 +08:00