Commit graph

11724 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
feeb52949f MDL-30328 some whitespace changes 2011-11-21 02:23:51 +01:00
Eloy Lafuente (stronk7)
27e5ce8b9f Merge branch 'MDL-30328' of git://github.com/scriby/moodle 2011-11-21 02:22:40 +01:00
Eloy Lafuente (stronk7)
e5235e6eef Merge branch 'MDL-30326' of git://github.com/scriby/moodle 2011-11-21 02:03:51 +01:00
Charles Fulton
6737aae6bb MDL-30289 forum - set page context when pruning a discussion 2011-11-21 08:58:26 +08:00
Eloy Lafuente (stronk7)
5f72d1025b MDL-30354 lti - whitespace fixes 2011-11-21 01:57:24 +01:00
Eloy Lafuente (stronk7)
d167cc3397 Merge branch 'MDL-30354' of git://github.com/scriby/moodle 2011-11-21 01:48:52 +01:00
Eloy Lafuente (stronk7)
77a7978f11 MDL-20534 lti: B9 - mini bump 2011-11-21 01:27:34 +01:00
Eloy Lafuente (stronk7)
695f327a70 Merge branch 'MDL-30343' of git://github.com/scriby/moodle 2011-11-21 01:17:06 +01:00
Eloy Lafuente (stronk7)
0fca3dbbce Merge branch 'MDL-30341' of git://github.com/scriby/moodle 2011-11-21 01:11:54 +01:00
Eloy Lafuente (stronk7)
253f5575c9 MDL-30339 lti lang - whitespace fixes 2011-11-21 01:03:22 +01:00
Eloy Lafuente (stronk7)
8efcee5f8c Merge branch 'MDL-30295' of git://github.com/scriby/moodle
Conflicts:
	mod/lti/lang/en/lti.php
2011-11-21 00:58:12 +01:00
Eloy Lafuente (stronk7)
34087d7be2 Merge branch 'MDL-30339' of git://github.com/scriby/moodle 2011-11-21 00:50:32 +01:00
Mary Evans
24050190e3 MDL-29226 RTL fixes - additions and amendments 2011-11-19 00:53:14 +00:00
Chris Scribner
036e84c389 MDL-30354 lti - B27 - locallib changes 2011-11-18 12:38:41 -05:00
Eloy Lafuente (stronk7)
668933bcaa MDL-20534 lti: B14 - tiny bit, but savepoint tests require that 2011-11-18 17:19:59 +01:00
Chris Scribner
532ae9aa34 MDL-30295 lti - Adding lti:manage localization string. 2011-11-18 11:19:07 -05:00
Chris Scribner
efba8960e1 MDL-20534 lti: B11 - Making language file changes (re-order, markdown, remove newlines in strings) 2011-11-18 11:18:36 -05:00
Eloy Lafuente (stronk7)
194f2c60ef MDL-20534 lti: B14 - whitespace and comment fixes 2011-11-18 16:05:22 +01:00
Eloy Lafuente (stronk7)
3a2927081c Merge branch 'MDL-30290' of git://github.com/scriby/moodle 2011-11-18 13:40:16 +01:00
Aparup Banerjee
8adce198e4 Merge branch 'MDL-30279-master' of git://github.com/ankitagarwal/moodle 2011-11-18 15:34:18 +08:00
Charles Fulton
5a1038bb47 MDL-30273 prevent the creation of discussions in simple single forums 2011-11-18 14:11:49 +08:00
Chris Scribner
38936053a3 MDL-20534 lti: B9 - Adding db/log.php 2011-11-17 16:41:45 -05:00
Chris Scribner
aeae316274 MDL-20534 lti: B28 - Accidentally included Copyright header in wrong file. 2011-11-17 16:30:20 -05:00
Chris Scribner
8f45215d1c MDL-20534 lti: B28 - Update attribution headers. 2011-11-17 16:29:50 -05:00
Chris Scribner
76519c52f0 MDL-20534 lti: B11 - Making language file changes (re-order, markdown, remove newlines in strings) 2011-11-17 15:50:14 -05:00
Charles Severance
6edcab7a1a MDL-20534
Undo change that Chris already did.
2011-11-17 10:35:07 -05:00
Charles Severance
461bde28d8 MDL-20534
Add the tool_consumer_info fields and fix parsing of custom parameters.
2011-11-17 10:34:58 -05:00
Chris Scribner
34eb05018f MDL-20534 lti: Some cleanup of locallib.php 2011-11-17 10:34:45 -05:00
Charles Severance
ddcfda87d6 MDL-20534
I ran the software through the certification and caught a few nits:

The error return is 'failure' not 'error'
The spec says that it needs to return 'failure' for out of range or non-numeric grades
The result score needs a language tag, hard-coded as 'en'
Setting a grade multiplied by 100 but reading the grade did not divide by 100
All those are now fixed with this patch as well as this bit of cruft:

I removed the "extension service url" as it is not implemented in service.php

Feel free to review and adjust - probably the one place you might want to refactor
is that I put code to catch out-of-range-and non-numeric in
lti_parse_grade_replace_message and threw an exception on error and then caught
it in service.php and sent back the 'failure' message. Feel free to refactor a
bit if you see this done in a cleaner manner.
2011-11-17 10:34:23 -05:00
Chris Scribner
0297a3d4b7 MDL-20534 lti: Updating the tool consumer information strings to match newest spec version. 2011-11-17 10:34:07 -05:00
Chris Scribner
776e5cfa0f MDL-20534 lti: B8 - Switching from $ME to $FULLME to properly detect SSL requests. 2011-11-17 09:35:56 -05:00
Chris Scribner
b07878ec7d MDL-20534 lti: B14 - Implementing "show description on course page" 2011-11-17 09:28:40 -05:00
Eloy Lafuente (stronk7)
f71e41691a Merge branch 'MDL-30182' of git://github.com/timhunt/moodle 2011-11-17 10:53:56 +01:00
Tim Hunt
0850e6301a MDL-30182 fix missing include. Sorry. 2011-11-17 08:02:20 +00:00
Charles Fulton
9f2dc66f72 MDL-30279 show full date and time for all wiki revisions 2011-11-17 08:54:50 +05:30
Sam Hemelryk
b750c6b388 Merge branch 'MDL-24577-master-1' of git://git.luns.net.uk/moodle 2011-11-17 14:53:38 +13:00
Eloy Lafuente (stronk7)
1f40b7e252 Merge branch 'MDL-29743' of git://github.com/timhunt/moodle 2011-11-17 01:22:22 +01:00
Eloy Lafuente (stronk7)
d647c2d608 Merge branch 'MDL-30069' of git://github.com/timhunt/moodle 2011-11-17 00:45:00 +01:00
Eloy Lafuente (stronk7)
e929eb0353 Merge branch 'MDL-30122' of git://github.com/timhunt/moodle 2011-11-17 00:33:54 +01:00
Eloy Lafuente (stronk7)
e5bac3491a Merge branch 'MDL-30182' of git://github.com/timhunt/moodle 2011-11-17 00:18:25 +01:00
Eloy Lafuente (stronk7)
7f8dc336aa Merge branch 'MDL-30209' of git://github.com/timhunt/moodle 2011-11-17 00:02:02 +01:00
Nadav Kavalerchik
7a25d39873 MDL-27516 Several CSS fixes for right to left languages 2011-11-17 11:42:12 +13:00
Eloy Lafuente (stronk7)
2fee72e19b Merge branch 'MDL-30275-master' of git://github.com/sammarshallou/moodle 2011-11-16 21:29:25 +01:00
Ankit Kumar Agarwal
63a1625d78 MDL-30279 SCORM Fixing sql errors during cron 2011-11-16 09:47:00 +05:30
Dan Marsden
23b3e448b2 SCORM MDL-25757 fix for saving of duplicate CMI values - thanks to Evan Irving-Pease for the patch 2011-11-16 10:50:55 +13:00
Dan Marsden
d3bf0a950f SCORM AICC MDL-30223 invalid call to update_record - very hard to test/reproduce. 2011-11-16 08:48:50 +13:00
sam marshall
24ad1d1feb MDL-30275 Assignment activity description not displayed on course page 2011-11-15 15:24:08 +00:00
Tim Hunt
08502b574d MDL-30182 quiz grade.php should support userid param. 2011-11-15 11:36:10 +00:00
Tim Hunt
7238cd2ef0 MDL-30209 quiz refers to wrong rendere method in two places.
Thanks to Dan Marsden for working out the fix.
2011-11-15 11:23:03 +00:00
Tim Hunt
94c0ec2159 MDL-30185 question engine reporting: add redundant where to query for perf.
Without this, MySQL fails to cope.
2011-11-15 11:19:15 +00:00