mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-06 16:59:56 +01:00
Code Issues Projects Releases Wiki Activity
47,851 Commits 36 Branches 523 Tags
Commit Graph

47851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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)
269c173e81 whitespace fixes 2011-06-13 12:21:48 +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
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
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
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
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)
6911fa130b weekly release 2.1dev 2011-06-09 03:41:42 +02:00
Eloy Lafuente (stronk7)
c7dbcc9452 Merge branch 'MDL-27770' of git://github.com/timhunt/moodle 2011-06-09 01:41:24 +02:00
Eloy Lafuente (stronk7)
d92858291a Merge branch 'wip-MDL-27638-master' of git://github.com/samhemelryk/moodle 2011-06-09 01:20:54 +02: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
Eloy Lafuente (stronk7)
112c26e9dd Merge branch 'wip-MDL-27676-master' of git://github.com/samhemelryk/moodle 2011-06-09 00:36:00 +02:00
Tim Hunt
810c5b9e5a MDL-27770 unnecessary upgrade step copied into quiz upgrade script. 2011-06-08 17:48:43 +01:00
Sam Hemelryk
82ee5a1f41 MDL-27676 Requests for a users profile pic that doesnt exist now redirect to the requested f1/f2 rather than just f1 2011-06-08 18:05:23 +08:00
Sam Hemelryk
32825ebd3d MDL-27566 Fixed up typo with user prefs 2011-06-08 17:54:25 +08: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
Jerome Mouneyrac
c1b658832d MDL-27551 add enable mobile feature (enable web services + mobile service - add mobile builtin service - add unique shortname for service) 2011-06-08 15:10:26 +08:00
Sam Hemelryk
287d1c0c2c Merged branch 'MDL-25775_head' of git://github.com/grabs/moodle.git 2011-06-08 13:49:36 +08:00