51658 Commits

Author SHA1 Message Date
Jason Fowler
ae6313d4a7 MDL-30540 - BLOG - Fixing context problems for single blog entries - Thanks Aparup and Sam for the help 2012-02-03 10:49:52 +08:00
Andrew Davis
31eae0eb17 MDL-29892 grade: added a check to prevent hidden courses appearing on student overview reports 2012-02-03 08:46:54 +07:00
Dan Marsden
266540eb23 MDL-31461 Plagiarism - adjust api functions to allow better support for renderers 2012-02-03 11:37:51 +13:00
Tim Hunt
3bbac90b2a MDL-31469 formslib: fix invalid for="" attributes on optional dates 2012-02-02 18:38:01 +00:00
Anthony Forth
0f3f6fed69 MDL-31445 formslib: add a nice id and class to the wrapper div for CSS 2012-02-02 18:37:34 +00:00
Tim Hunt
cef18275b3 MDL-31407 quiz: review all uses of global $USER 2012-02-02 18:37:08 +00:00
Kyle Temkin
704f062b87 MDL-31407 quiz: finish_attempt method should not rely on $USER 2012-02-02 18:37:05 +00:00
Eloy Lafuente (stronk7)
baa5cd8240 weekly release 2.3dev 2012-02-02 12:12:25 +01:00
Jerome Mouneyrac
2214c4a2e8 MDL-27360 Web service tokens are displayed for deleted users 2012-02-02 15:34:05 +08:00
Aparup Banerjee
b0ce209054 Merge branch 'master_MDL-31360' of git://github.com/danmarsden/moodle 2012-02-02 11:22:58 +08:00
Eloy Lafuente (stronk7)
26ed4e73eb Merge branch 'MDL-29615_control_override_email2' of git://github.com/andyjdavis/moodle 2012-02-01 13:17:08 +01:00
Dan Marsden
2be99ddee8 MDL-31360 use extra param in get_in_or_equal - one less line of code... 2012-02-01 23:11:03 +13:00
Dan Marsden
03a6727b6c MDL-28522 Choice : View reports now correctly shows unanswered column - thanks to Marcus Boon for the patch 2012-02-01 11:24:54 +08:00
Andrew Davis
8900213b92 MDL-29615 message: reversed the default for messagingallowemailoverride and added upgrade code so upgraded sites maintain consistent behaviour 2012-02-01 09:26:53 +07:00
Eloy Lafuente (stronk7)
e691a270a9 Merge branch 'MDL-31267' of git://github.com/epsd/moodle 2012-02-01 01:03:21 +01:00
Eloy Lafuente (stronk7)
6ad5968d68 Merge branch 'wip-MDL-31160-m23' of git://github.com/samhemelryk/moodle 2012-02-01 00:53:16 +01:00
Eloy Lafuente (stronk7)
9a7e63128a Merge branch 'wip-MDL-31197-m23' of git://github.com/samhemelryk/moodle 2012-02-01 00:48:47 +01:00
Eloy Lafuente (stronk7)
94a0c97464 Merge branch 'master_MDL-31039' of git://github.com/danmarsden/moodle 2012-02-01 00:41:25 +01:00
Eloy Lafuente (stronk7)
8aac56c6be Merge branch 'MDL-31000-master-3' of git://git.luns.net.uk/moodle 2012-02-01 00:25:05 +01:00
Eloy Lafuente (stronk7)
a14e3f274e Merge branch 'MDL-31448_incorrect-comment' of https://github.com/ncsu-delta/moodle 2012-01-31 23:57:32 +01:00
Eloy Lafuente (stronk7)
f31e83015d MDL-30714 theme_afterburner: better, output the information, LOL 2012-01-31 23:37:19 +01:00
Mary Evans
250633ebe3 MDL-30714 theme_afterburner: logo link to home page 2012-01-31 23:19:21 +01:00
Glenn Ansley
7493a4bb3b MDL-31448 Replaced incorrect PHP comment 2012-01-31 14:39:23 -05:00
Eloy Lafuente (stronk7)
008bf7f0ac Merge branch 'MDL-31015-master' of git://github.com/sammarshallou/moodle 2012-01-31 19:44:21 +01:00
Eloy Lafuente (stronk7)
ba353742ce Merge branch 'MDL-30854' of git://github.com/timhunt/moodle 2012-01-31 19:30:58 +01:00
Eloy Lafuente (stronk7)
7ce92ac1ad Merge branch 'MDL-30484' of git://github.com/timhunt/moodle 2012-01-31 17:16:04 +01:00
Eloy Lafuente (stronk7)
ade31f5f4f Merge branch 'MDL-31314' of git://github.com/timhunt/moodle 2012-01-31 17:06:01 +01:00
Aparup Banerjee
d7da31228e Merge branch 'MDL-30828_feedback_sort' of git://github.com/andyjdavis/moodle 2012-01-31 16:48:59 +08:00
Aparup Banerjee
42edf34d43 Merge branch 'MDL-30707_forum_log' of git://github.com/andyjdavis/moodle 2012-01-31 16:43:28 +08:00
Aparup Banerjee
df71b4d72f Merge branch 'MDL-29097_mod_update_create' of git://github.com/andyjdavis/moodle 2012-01-31 14:21:14 +08:00
Aparup Banerjee
640d4d9563 Merge branch 'MDL-31426' of git://github.com/stronk7/moodle 2012-01-31 11:51:14 +08:00
Aparup Banerjee
6342696140 Merge branch 'MDL-31428' of git://github.com/stronk7/moodle 2012-01-31 11:15:26 +08:00
Andrew Davis
02c34fe143 MDL-30707 mod_forum: fixed a add_to_log() call that was causing invalid URLs to be added to the log 2012-01-31 09:06:01 +07:00
Andrew Davis
a5448b3f6b MDL-30828 mod_feedback: fixed sorting when viewing responses 2012-01-31 09:05:09 +07:00
Andrew Davis
088cc24ccd MDL-30722 mod_forum: prevented users being auto-logged in as guest when they access /mod/forum/unsubscribeall.php 2012-01-31 09:03:40 +07:00
Andrew Davis
84f533b3c3 MDL-29615 message: added the ability for admins to restrict users ability to set where their email message notifications go 2012-01-31 09:02:20 +07:00
Andrew Davis
c85cf7df5c MDL-29097 course: refactored to avoid having two seperate calls to events_trigger() 2012-01-31 09:00:53 +07:00
Eloy Lafuente (stronk7)
ecabd5b039 MDL-31428 forum: prevent some warnings with debug enabled 2012-01-31 00:22:32 +01:00
Eloy Lafuente (stronk7)
b688c44907 MDL-31426 forum: don't show/allow any subscription to not enrolled users 2012-01-30 23:20:03 +01:00
Tim Hunt
94815ccfa0 MDL-30484 question engine: don't lose response files when regrading.
The problem was mostly that, in the past, we did not worry if
question_attempt_step.id changed during regrade (because we deleted the
old step row and inserted a new one). However, now that steps can have
associated files, we can't be that slack, becuase the step id is used as
the file itemid.

So, now, we have to update the existing rows during a regrade. We do
this by having the question engine tell the question_engine_unit_of_work
that the step has first been deleted, and then added back. Then we make
the unit-of-work spot that delete + add = update.

This also means that during regrading, we have to pass around some extra
ids so that new steps know the id of the step they are replacing.

Naturally, this requires some quite trickly logic, so I finally got
around to writing unit tests for question_engine_unit_of_work, which is
a good thing.

Along the way I also got around to renaming
question_attempt->set_number_in_usage, which got missed out when
everthing else was renamed to slot ages ago.

Finally, while working on this code, I noticed and fixed some PHPdoc
comments.
2012-01-30 16:57:23 +00:00
Tim Hunt
72553162ba MDL-30854 quiz/question editing: fix create calc question & add on page.
This was one of those innocent seeming issues where, once you start
digging, you find a mess. In this case, the code that is now in
question_wizard_form::add_hidden_fields used to exist in four different
places, in four inconsistent versions. This is now all nicely
re-factored, and that solves the problem.

Along the way, I found and fixed some wrong string references in
qtype_random, and stripped out some unnecessary &s in function
declarations.
2012-01-30 12:32:12 +00:00
Tim Hunt
a60835c721 MDL-31314 gradebook restore: fix category.depth on restore.
Without this, restoring backups made with the OU's custom 'restore from
1.9' feature, and possibly other people's custom converstion code, does
not work properly.

Also, fix poor recordset code.
2012-01-30 12:31:43 +00:00
Aparup Banerjee
1fac035503 Merge branch 'MDL-26260' of git://github.com/timhunt/moodle 2012-01-30 16:23:54 +08:00
Aparup Banerjee
627618e140 Merge branch 'MDL-31311-Fix_iframe_titles' of git://github.com/ncsu-delta/moodle 2012-01-30 15:52:50 +08:00
Rossiani Wijaya
08b4a4e16f MDL-30983 calendar: updated phpdocs for calendar/lib.php 2012-01-30 15:38:25 +08:00
Rossiani Wijaya
93dd2725e8 MDL-30989 portfolio: updated portfolio phpdocs. 2012-01-30 15:37:46 +08:00
Aparup Banerjee
44983c3f3d Merge branch 'MDL-31319' of git://github.com/mackensen/moodle 2012-01-30 15:01:53 +08:00
Aparup Banerjee
fd174542e3 Merge branch 'MDL-31392' of git://github.com/timhunt/moodle 2012-01-30 14:24:31 +08:00
sam marshall
68828cc431 MDL-31015 File/URL resource 'Open' and 'Force download' options should work consistently 2012-01-27 16:01:19 +00:00
Glenn Ansley
4d7e89d72c MDL-31311 Enhance unhelpful iframe title attributes 2012-01-27 10:22:59 -05:00