10448 Commits

Author SHA1 Message Date
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
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
Dan Poltawski
065bee4b70 forum MDL-25909 - Fix undefined variable 2011-01-08 15:19:41 +00:00
David Mudrak
c56ed7bb85 MDL-24561 forum: require sesskey for the course-wide subscriptions
mod/forum/index.php allows to subscribe to and unsubscribe from all
forums in the course. However, sesskey was not checked here.
2011-01-05 13:01:46 +01:00
David Mudrak
6f7d65c724 MDL-24561 forum subscription checks sesskey
The only case when sesskey is not available is when we came to
subscribe.php from a link in email. In that case, we display a
confirmation page that redirects back providing the sesskey.
All other links to subscribe.php are fixed now so they provide sesskey
as a parameter.
I also polished $mode parameter handling a bit because the check
against empty string was not correct as the value is cast to PARAM_INT.
2011-01-05 13:01:46 +01:00
Sam Hemelryk
1be9192173 mod-wiki MDL-25793 Fixed database discrepancies between a fresh install and an upgraded site within the Wiki module 2011-01-04 09:43:45 +08:00
Petr Skoda
c81f657b4a MDL-22449 bumping major version to lang invalidate caches and fix phpdocs 2010-12-27 13:48:10 +01:00
Petr Skoda
c03b6176a6 Merge branch 'm20_MDL-22449_wiki_help_buttons' of git://github.com/dongsheng/moodle 2010-12-27 13:44:54 +01:00
Petr Skoda
1310964bb3 Merge branch 'MDL-24860_messaging_providers' of git://github.com/andyjdavis/moodle
Conflicts:
	mod/lesson/version.php
2010-12-27 13:39:20 +01:00
Petr Skoda
1af9fd3879 Merge branch 'MDL-25761_data_portfolio' of git://github.com/mudrd8mz/moodle 2010-12-27 12:29:15 +01:00
andyjdavis
54672f15b4 lesson MDL-24860 added mod/lesson/db/messages.php 2010-12-22 12:12:35 +08:00
andyjdavis
d8f1412819 message MDL-24860 fixed messaging code in mod_lesson and marked spots that are directly sending email 2010-12-22 12:05:49 +08:00
David Mudrak
ee314f4019 MDL-25761 Database module: missing portfolio library inclusion
Portfolios are not officially supported in Database module yet. But this
missing library inclusion is a coding error because the class defined in
the library is already used in the code.
2010-12-21 10:40:19 +01:00
Eloy Lafuente (stronk7)
dde5bfbcf7 MDL-25178 glossary - add completionentries rule 2010-12-20 20:02:04 +01:00
Petr Skoda
ab6e79718c Merge branch 'MDL-25632' of git://github.com/samhemelryk/moodle 2010-12-20 19:21:20 +01:00
Eloy Lafuente (stronk7)
6fe79e7fba MDL-25656 glossary filter - make alias links to work 2010-12-20 18:25:50 +01:00
Tim Hunt
d9c26e2174 blocklib MDL-25654 fix API inconsistency be renaming add_pretend_block to add_fake_block.
I added a deprecated method add_pretend_block that forwards to add_fake_block, so old code should be break. However, I aslo updated all the callers in core code.
2010-12-20 18:22:37 +01:00
Dongsheng Cai
cc26cb3b33 MDL-10783, added span class and tag title 2010-12-20 17:00:34 +01:00
Dongsheng Cai
7b8b366218 Linking wiki pages to other moodle stuff by tag, and remove an unused function in wiki 2010-12-20 17:00:34 +01:00
Petr Skoda
c35ae13691 MDL-25674 forum must send full user record when setting up different session user in cron 2010-12-20 14:41:17 +01:00