10416 Commits

Author SHA1 Message Date
Sam Hemelryk
4fd25ab95c Merge branch 'm20_MDL-26063_SCORM_grouping' of git://github.com/danmarsden/moodle 2011-01-24 11:02:07 +08:00
Sam Hemelryk
ab8bc2ee1c Merge branch 'MDL-25884' of git://github.com/timhunt/moodle 2011-01-24 10:20:22 +08:00
Petr Skoda
99d19c13ae MDL-25855 some more missing filelib includes 2011-01-23 18:34:41 +01:00
Petr Skoda
e83a6a22d4 MDL-26106 fix lable typo
credit goes to fautrero
2011-01-23 15:36:06 +01:00
Eloy Lafuente (stronk7)
cfd62f13a1 MDL-25708 recordsets - url module 2011-01-22 12:54:40 +01:00
Eloy Lafuente (stronk7)
a1d870aa95 MDL-25708 recordsets - survey module 2011-01-25 19:59:02 +01:00
Eloy Lafuente (stronk7)
676874df1d MDL-25708 recordsets - scorm module 2011-01-25 19:59:02 +01:00
Eloy Lafuente (stronk7)
8ce9a2b26d MDL-25708 recordsets - resource module 2011-01-25 19:59:01 +01:00
Eloy Lafuente (stronk7)
3f2efc20ad MDL-25708 recordsets - page and quiz modules 2011-01-25 19:59:01 +01:00
Eloy Lafuente (stronk7)
a8307c22c2 MDL-25708 recordsets - imscp and lesson modules 2011-01-25 19:59:01 +01:00
Eloy Lafuente (stronk7)
ec577b0538 MDL-25708 recordsets - glossary module 2011-01-25 19:59:01 +01:00
Eloy Lafuente (stronk7)
56d1c48f24 MDL-25708 recordsets - forum module 2011-01-25 19:59:01 +01:00
Eloy Lafuente (stronk7)
05c707dacc MDL-25708 recordsets - folder module 2011-01-25 19:59:00 +01:00
Eloy Lafuente (stronk7)
6b1b1d0339 MDL-25708 recordsets - assignment and data modules 2011-01-25 19:59:00 +01:00
Daren Chandisingh
fe4457ae29 [MDL-25874] Handle 'Cancel' action when editing lessons 2011-01-20 11:07:14 +00:00
Dan Marsden
c371e39316 SCORM MDL-26063 incorrect context used - thanks to Matteo Scaramuccia for fix 2011-01-20 10:40:22 +13:00
Tim Hunt
151c2284dd quiz MDL-25884 mod/quiz/index.php broken when logged in as a student. 2011-01-18 23:17:46 +00:00
Petr Skoda
2f20e23ba6 MDL-25791 PULL-125 reverting commits that create null problems during upgrade 2011-01-17 21:08:05 +01:00
Petr Skoda
1f50b85867 Merge branch 'MDL-25791' of git://github.com/samhemelryk/moodle 2011-01-17 20:52:31 +01:00
Petr Skoda
9c170a4323 Merge branch 'MDL-25792' of git://github.com/samhemelryk/moodle 2011-01-17 20:49:53 +01:00
Petr Skoda
39e316e167 Merge branch 'MDL-25722' of git://github.com/timhunt/moodle 2011-01-17 20:22:26 +01:00
Petr Skoda
bb871bc4ca Merge branch 'workshop_random_allocator' of git://github.com/mudrd8mz/moodle 2011-01-17 19:02:55 +01:00
Tim Hunt
c97325f6e8 quiz MDL-25722 get rid of annoying alerts when quiz is in 'secure' mode.
See http://moodle.org/mod/forum/discuss.php?d=165772, where people have tried out this fix and found that it works.
2011-01-17 13:34:46 +00:00
David Mudrak
241e58e44b MDL-25982 Workshop: users from the same group may be excluded from allocation in visible group mode
If the Workshop is in the visible group mode, members of the same group
can be now optionally excluded from random allocation for a given user.
2011-01-16 19:38:56 +01:00
David Mudrak
a1dc301ed5 MDL-25523 Workshop: not-grouped users are excluded from allocation in visible group mode
There was a bug as these users were ignored only as squares but not as
circles. This patch makes sure that no new allocation are added to
not-grouped users in visible group mode. However, the options 'Remove current
allocations' and 'Add self-assessments' apply to them intentionally.

Also, the user is warned if there are some not-grouped users found in a
workshop in visible groups mode or separate groups mode.
2011-01-16 19:38:37 +01:00
David Mudrak
47ce9385e8 MDL-25526 Workshop: fixed random allocation of reviews
The patch wraps that foreach ($circles as $circleid => $circle)
loop by yet another one for() loop. Reviews are allocated iteratively
now. During the first iteration, we try to make sure that at least one
circle link exists. During the second iteration, we try to allocate two,
etc. Circles are shuffled at the beginning of each iteration.
This is supposed to improve the randomness of the allocation.

The patch also fixes shuffle_assoc() implementation. The previous
implementation actually did not work at all. Also, that removed called
to shuffle_assoc() was redundant here.
2011-01-14 14:20:41 +01:00
Sam Hemelryk
e4e19a65f9 mod-quiz MDL-25791 bumped version number, rebased patch, and removed unwanted phpdoc global 2011-01-14 17:49:12 +08:00
Sam Hemelryk
b3abfc46e3 mod-quiz MDL-25791 Added conditions around upgrade code so that it is only executed if needed 2011-01-14 17:44:10 +08:00
Sam Hemelryk
0022ea3669 mod-quiz MDL-25791 Fixed database discrepancies between a fresh install and an upgraded site within the Quiz module 2011-01-14 17:44:06 +08:00
Petr Skoda
8a7703ce53 MDL-25973 add missing charset 2011-01-14 09:32:17 +01:00
Dongsheng Cai
79f0bac62e WIKI MDL-25501 1. check if wiki entry exists before insert new entry 2. check wiki version record mimetype, if it is not empty, try to export the content to file pool 2011-01-14 14:17:24 +08:00
Sam Hemelryk
631cefc35f mod-scorm MDL-25792 Changed forcecompleted to have lenght 1 and bumbed version number 2011-01-14 11:09:59 +08:00
Sam Hemelryk
b964171cbf mod-scorm MDL-25792 Fixed database discrepancies between a fresh install and an upgraded site within the SCORM module 2011-01-14 11:01:30 +08:00
Tim Hunt
7a7197482d MDL-20636 Fix if the use of the File API so images work in questions. 2011-01-13 18:35:57 +00:00
Tim Hunt
cce1b6556c MDL-20636 Fix a bunch of minor errors in the truefalse preview.
Most significantly, all behaviours now work.
2011-01-13 18:35:46 +00:00
Tim Hunt
d1b7e03d5d MDL-20636 Current work-in-progress converting the question engine to Moodle 2.0 2011-01-13 18:35:29 +00:00
Petr Skoda
90c42e0f43 MDL-25501 reverting PULL-95 2011-01-11 22:53:16 +01:00
Eloy Lafuente (stronk7)
742d877eaf Merge branch 'MDL-25793' of git://github.com/samhemelryk/moodle 2011-01-11 00:33:56 +01:00
Eloy Lafuente (stronk7)
a9af868943 Merge branch 'MDL-24561_forum_subscribe_sesskey' of git://github.com/mudrd8mz/moodle 2011-01-10 21:38:13 +01:00
Eloy Lafuente (stronk7)
a3c896ae4d Merge branch 'm20_MDL-25794_sections_typo' of git://github.com/danmarsden/moodle 2011-01-10 21:22:02 +01:00
Petr Skoda
9c15755633 Merge branch 'm20_MDL-25501_wiki_upgrade_improvement' of git://github.com/dongsheng/moodle 2011-01-10 14:54:53 +01:00
Petr Skoda
2f1b1abc83 Merge branch 'MDL-25232' of git://git.luns.net.uk/moodle 2011-01-10 14:35:38 +01:00
Petr Skoda
d32c077bf6 Merge commit 'ed5c4cf44d0b38e129ad57747dfaf16d9677d465' 2011-01-10 14:21:15 +01:00
Sam Hemelryk
d481e2a8e3 mod-wiki MDL-25793 Bumped version number and adjusted version number in new upgrade code. 2011-01-10 17:31:40 +08:00
Sam Hemelryk
4b3c86b152 Merge branch 'MDL-24133' of git://git.luns.net.uk/moodle 2011-01-10 16:40:30 +08:00
Dongsheng Cai
77064d2b4f WIKI MDL-25501 1. check if wiki entry exists before insert new entry 2. check wiki version record mimetype, if it is not empty, try to export the content to file pool 2011-01-10 10:07:34 +08:00
Dan Marsden
2e3c31bca3 SCORM MDL-25794 fix db call to use select_menu to pass into single_select renderer - also fix small typo for label/lable 2011-01-10 11:22:50 +13:00
Dan Poltawski
ed4a7e4b07 forum MDL-25232 - fix unbalanced divs 2011-01-09 21:11:01 +00:00
Dan Marsden
ed5c4cf44d SCORM MDL-25891 typo causing general exception for some SCORM objects - thanks to Hais Deakin for report/fix 2011-01-10 09:24:16 +13:00
Dan Poltawski
e594fc8d13 mod/data MDL-24133 - footer called before header 2011-01-09 19:31:25 +00:00