Commit graph

49559 commits

Author SHA1 Message Date
Tim Hunt
8dd9ccf475 MDL-29447 quiz course reset does not reset the quiz_grades table.
Thank to Jean-Michel Vedrine for working out the basic idea of the fix.
2011-10-04 22:47:44 +01:00
Eloy Lafuente (stronk7)
cec6a15b99 Merge branch 'MDL-29644' of git://github.com/timhunt/moodle 2011-10-04 23:34:15 +02:00
Tim Hunt
77d0f5f07b MDL-29644 qtype multianswer, hints lost doing Moodle XML export.
This commit also includes a lot of useful tidying up of some of the unit
test helper code. I turned out that I could not use all the helper code
in my new tests, but despite that it will be useful in the future, so I
am committing it here.
2011-10-04 22:23:58 +01:00
Aparup Banerjee
2fbc708186 Merge branch 'MDL-29089_grade_history_missing_columns2' of git://github.com/andyjdavis/moodle.git (resolved version.php conflicts) 2011-10-05 02:46:38 +08:00
Eloy Lafuente (stronk7)
a361676b22 Merge branch 'MDL-27857-assignment-portfolio' of git://github.com/mudrd8mz/moodle 2011-10-04 12:42:32 +02:00
Eloy Lafuente (stronk7)
66f7705daa Merge branch 'MDL-29548' of git://github.com/timhunt/moodle 2011-10-04 12:31:34 +02:00
Tim Hunt
7529f9e944 MDL-29548 allow message plugins to control message
defaults.

At the moment, each message_provider can specify defaults for
each message output, to say whether that message output should be
used for this type of message:
http://docs.moodle.org/dev/Messaging_2.0#Adding_new_message_type.

If the message provider does not set a default, this change allows
the message output to set the default.
2011-10-04 11:23:52 +01:00
Eloy Lafuente (stronk7)
cdee9bd4f6 Merge branch 'MDL-19575-master' of git://github.com/ankitagarwal/moodle 2011-10-04 12:12:08 +02:00
Tim Hunt
f0bfd964ba MDL-29520 question engine: work-around bad MySQL delete performance.
This is a temporary fix, until the new API from MDL-29589 is available.

(amended to fix comments)
2011-10-04 12:03:41 +02:00
Tim Hunt
7042a252c5 MDL-29571 questions: improve class=accesshide screen-reader hints.
This changes the hint that comes before the question text. There are
unit tests to verify the new behaviour.

(amended to fix comments)
2011-10-04 11:50:56 +02:00
Tim Hunt
9d1658a07e MDL-29571 qtype description refactor unit test code a bit. 2011-10-04 11:50:12 +02:00
Sam Hemelryk
0870a06899 Merge branch 'MDL-29621_master_wip' of git://github.com/grabs/moodle 2011-10-04 17:54:00 +13:00
Sam Hemelryk
6fdcc0d44f MDL-28615 forum: Fixed missing context regression 2011-10-04 16:37:16 +13:00
Sam Hemelryk
2bbe5979cb Merge branch 'MDL-28725_wiki_section2' of git://github.com/andyjdavis/moodle 2011-10-04 16:21:16 +13:00
Sam Hemelryk
66d216c574 Merge branch 'wip-mdl-25937-disableif' of git://github.com/rajeshtaneja/moodle 2011-10-04 15:52:57 +13:00
Eloy Lafuente (stronk7)
c72cf85f17 Merge branch 'MDL-29511' of git://github.com/timhunt/moodle 2011-10-04 01:11:20 +02:00
Eloy Lafuente (stronk7)
38697ad4aa Merge branch 'MDL-29216' of git://github.com/timhunt/moodle 2011-10-03 22:52:55 +02:00
Eloy Lafuente (stronk7)
92c9bc6127 Merge branch 'MDL-29341' of git://github.com/timhunt/moodle 2011-10-03 22:50:18 +02:00
Eloy Lafuente (stronk7)
eefebc2edb Merge branch 'MDL-29570' of git://github.com/timhunt/moodle 2011-10-03 21:42:28 +02:00
Andreas Grabs
af26e3453a MDL-29621 - XHTML not welformed when creating Feedback questions 2011-10-03 18:40:16 +02:00
Tim Hunt
e07cccfc25 MDL-28469 quiz settings pages should be pagelayout admin. 2011-10-03 16:38:34 +01:00
Rajesh Taneja
63d5c4ac85 MDL-25937 Forms Library: Filepicker will respect disable if 2011-10-03 16:26:21 +08:00
David Mudrak
fd04c5bd87 MDL-27857 Export to portfolio support in the assignment module improved
Portfolio API code in the assignment module expected that the current
user is the author of the submission. Therefore the "Export to
portfolio" button did not work when the submission was viewed by a
teacher (eg at the page with the list of all submissions in the Advanced
upload assignment).

This patch introduces a new callback argument 'submissionid' that holds
explicit ID of the submission the export deals with. With it available,
we do not need to expect the current user is the author of the
submission.

The patch also cleans some strings used for portfolio callback
exceptions.
2011-10-03 10:15:39 +02:00
David Mudrak
d3996e0705 MDL-27857 Typo in the phpDocs fixed 2011-10-03 10:15:38 +02:00
David Mudrak
b777c798b0 MDL-27857 Assignment does not use form tag to render portfolio export control widget
When this code was used as a part of the grading screen, the default
PORTFOLIO_ADD_FULL_FORM widget led to nested form elements. This patch replaces
the form widget with a plain text link that can be embedded safely.
2011-10-03 10:15:38 +02:00
Aparup Banerjee
6d3ae9103c MDL-26486 Lesson : fixed whitespace 2011-10-03 16:00:24 +08:00
Aparup Banerjee
b735bd19cc Merge branch 'MDL-26486' of git://github.com/rwijaya/moodle 2011-10-03 15:37:50 +08:00
Andrew Davis (andyjdavis)
c04b01f46f MDL-27640 rating: altered the return url provided by mod_data to ratings 2011-10-03 15:17:27 +08:00
Aparup Banerjee
9928cc8aa2 MDL-29541 Administration : fixed whitespace 2011-10-03 14:01:17 +08:00
Aparup Banerjee
c1b723e5f1 Merge branch 'wip-mdl-29244' of git://github.com/rajeshtaneja/moodle 2011-10-03 13:57:48 +08:00
Rajesh Taneja
542cde9977 MDL-29244 users: Fixed comments for checkbox.php 2011-10-03 13:42:27 +08:00
Sam Hemelryk
1bbe222d53 Merge branch 'MDL-29296' of git://github.com/rwijaya/moodle 2011-10-03 17:08:21 +13:00
Sam Hemelryk
324e620474 Merge branch 'MDL-29605' of git://github.com/lazydaisy/moodle 2011-10-03 16:41:12 +13:00
Sam Hemelryk
006debe5e4 Merge branch 'wip-mdl-29539' of git://github.com/rajeshtaneja/moodle 2011-10-03 15:09:17 +13:00
Sam Hemelryk
36e966b005 MDL-28566 theme_base: removed MDL comment 2011-10-03 15:02:33 +13:00
Sam Hemelryk
2c66ceeaef Merge branch 'MDL-28566' of git://github.com/lazydaisy/moodle 2011-10-03 14:37:35 +13:00
Sam Hemelryk
3a2abe2e6e Merge branch 'MDL-29323' of git://github.com/lazydaisy/moodle 2011-10-03 14:29:49 +13:00
Sam Hemelryk
49ebdaf1da Merge branch 'wip-MDL-25454-master' of git://github.com/marinaglancy/moodle 2011-10-03 14:24:38 +13:00
Sam Hemelryk
9ea1b97fa4 Merge branch 'MDL-29558' of git://github.com/jamiepratt/moodle 2011-10-03 14:01:48 +13:00
AMOS bot
3551164776 Automatically generated installer lang files 2011-10-03 00:55:23 +00:00
Sam Hemelryk
ef6380f042 Merge commit 'FETCH_HEAd' 2011-10-03 13:29:26 +13:00
Sam Hemelryk
1efd3fc8e7 Merge branch 'MDL-29567' of git://github.com/stronk7/moodle 2011-10-03 13:23:01 +13:00
Sam Hemelryk
dcde0e9389 Merge branch 'MDL-29566' of git://github.com/stronk7/moodle 2011-10-03 12:49:39 +13:00
Sam Hemelryk
9209bcfbb1 Merge branch 'MDL-29618' of git://github.com/stronk7/moodle 2011-10-03 12:27:11 +13:00
Sam Hemelryk
e06ae159ff Merge branch 'MDL-29612' of git://github.com/stronk7/moodle.git with typo cleanup 2011-10-03 12:24:40 +13:00
Eloy Lafuente (stronk7)
35aa80d166 Merge branch 'w39_MDL-29555_m22_yui341' of git://github.com/skodak/moodle 2011-10-03 01:06:15 +02:00
Sam Hemelryk
dc39771b01 Merge branch 'MDL-29611' of git://github.com/stronk7/moodle 2011-10-03 12:02:58 +13:00
Sam Hemelryk
9afd0b3e2e Merge branch 'MDL-27295' of git://git.luns.net.uk/moodle 2011-10-03 11:51:30 +13:00
Eloy Lafuente (stronk7)
f253e791ed MDL-29618 backup - back to handling enrolments properly. Regession of MDL-26841, my fault, grrr 2011-10-03 00:45:18 +02:00
Sam Hemelryk
61ab8f0749 MDL-28615 forum: Revised enrol_sharing_course to use the new enrol_get_shared_courses and fixed permission checking in forum_user_can_see_post 2011-10-03 11:23:30 +13:00