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
David Mudrak
b61cf3ff8a
MDL-22414 Merge branch 'master' into backup-convert
...
Conflicts:
theme/base/style/core.css
2011-06-09 13:04:49 +02:00
David Mudrak
fad0f24499
MDL-22414 Removing obj_to_readable helper
2011-06-09 11:38:15 +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
David Mudrak
4ece48dc36
MDL-22414 Fixed the order of course modules in the restored course
...
During the restore, the section's sequence field is ignored and the
order of modules is controlled by the order of the <contents> activity
elements. This patch makes sure that the modules are listed in that
section in the right order.
Also, the patch removes the obsolete stash sectionidslist which was
introduced when the method get_stash_itemids() had not existed yet.
2011-06-09 02:41:27 +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
David Mudrak
30d5190a9b
MDL-27452 Workshop 1.9 backups conversion support
2011-06-09 00:00:03 +02:00
David Mudrak
a5f2b97b7f
MDL-22414 Fixed debugging information when a particular exception is thrown
2011-06-08 19:15:40 +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
David Mudrak
33560f50fb
MDL-22414 Added new inforef manager
...
This helper class keeps the referenced ids to be dumped into the
inforef.xml files. For now, it uses a in-memory storage structures but
in the future we may refactor it so that it can use some persistent
storage (like converter's stashes).
2011-06-08 10:18:56 +02:00
David Mudrak
e29746c25f
MDL-22414 Added scales conversion handler
2011-06-08 10:18:44 +02: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
Aparup Banerjee
3b6711d5ce
MDL-27695 Documentation : updated the moodle docs link at the footer of pages to point to new docs url
2011-06-08 13:44:35 +08:00
Sam Hemelryk
131a9071d6
Merged branch 'MDL-27118' of git://github.com/epsd/moodle.git
2011-06-08 13:42:33 +08:00
Sam Hemelryk
de133aa87f
Merge branch 'MDL-27294' of git://github.com/epsd/moodle
2011-06-08 13:38:35 +08:00
