Commit graph

11545 commits

Author SHA1 Message Date
Sam Hemelryk
d905b69e95 Merge branch 'MDL-29115' of git://github.com/rwijaya/moodle 2011-11-25 11:53:24 +13:00
Ankit Kumar Agarwal
6348043461 MDL-30422 SCORM Fixing old variable use in interraction report 2011-11-24 12:53:37 +05:30
Aparup Banerjee
3ca3098f31 Merge branch 'MDL-29226' of git://github.com/lazydaisy/moodle 2011-11-24 14:39:53 +08:00
Andrew Robert Nicols
9e23487a10 MDL-30428 Add br tag when showing the 'Export to Portfolio' text 2011-11-23 14:07:52 +00:00
Eloy Lafuente (stronk7)
c897e4639c Merge branch 'MDL-30398-master' of git://github.com/ankitagarwal/moodle 2011-11-23 13:19:21 +01:00
Eloy Lafuente (stronk7)
3a02133f3f Merge branch 'master_MDL-25757' of git://github.com/danmarsden/moodle 2011-11-23 11:07:50 +01:00
Rossiani Wijaya
4fd95658bb MDL-29115 lesson mod: fixed the display of 'try again' button so it relates to lesson setting 2011-11-23 10:34:49 +08:00
adrian@moodle.com
b489d37d56 MDL-27334 - forum - Fixed the issue of error session keys being displayed when trying to browse to a site without logging in. 2011-11-23 09:43:39 +08:00
Eloy Lafuente (stronk7)
ea46fcbced Merge branch 'master_MDL-30223' of git://github.com/danmarsden/moodle 2011-11-23 01:20:39 +01:00
Nadav Kavalerchik
bc86c87261 MDL-30361 - mod/assignment, fix right margin of felement on Grading page that is linked from the user's submissions page (In RTL mode) Not sure what the previous fix was doing, (i made it on a previous commit) hope it does not break some other UI element when in RTL mode. 2011-11-23 01:31:54 +02:00
Nadav Kavalerchik
10625d2efe MDL-30361 - mod/glossary/editcategories.php - fix spelling ($rightalignment) 2011-11-23 01:31:54 +02:00
Nadav Kavalerchik
efbbe2f047 MDL-29226 - right align table's cells, in Glossary edit categories page (when in RTL mode)(cherry picked from commit 9ace475) 2011-11-23 01:31:53 +02:00
Ankit Kumar Agarwal
7b5abb50ce MDL-30398 Validations added for password field 2011-11-22 14:23:05 +05:30
Rossiani Wijaya
db8312d23c MDL-27735 Q&A forum: add new caps to add question. By default, teacher, editing teacher and manager role has the capability to add new question 2011-11-22 15:26:44 +08:00
Andrew Robert Nicols
70eddb71cf MDL-30174 Assignment : Only increment submission offset if the current assignment was not saved 2011-11-22 02:20:16 +08:00
Andrew Robert Nicols
89a4471b97 MDL-30173 Assignment : Convert to use moodle_url and add missing filter param 2011-11-22 02:02:26 +08:00
Eloy Lafuente (stronk7)
7715c88d36 MDL-30344 lti - whitespace & comments cleanup 2011-11-21 16:59:58 +01:00
Chris Scribner
59fc5c5404 MDL-30344 lti - Hiding roster permission from the UI as it's not implemented in LTI 1.1. 2011-11-21 16:42:28 +01:00
Chris Scribner
038d8e30c3 MDL-30344 lti - Fix issue with privacy settings not working for a course level tool if no Launch URL is specified. 2011-11-21 16:42:12 +01:00
Chris Scribner
4c598b133f MDL-20534 lti: Updating privacy settings dynamically based on matched Launch URL. 2011-11-21 16:42:12 +01:00
Aparup Banerjee
9dc97097b1 Merge branch 'wip-MDL-30289-master' of git://github.com/abgreeve/moodle 2011-11-21 13:57:34 +08:00
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