Commit Graph

7928 Commits

Author SHA1 Message Date
David Ormsbee
df85ac5762 Merge pull request #616 from MITx/feature/dave/external_forum
Add support for external forum link. Reviewed by Victor.
2012-09-03 07:54:38 -07:00
David Ormsbee
ea78559ad3 Changed FIXME -> TODO in response to comments 2012-09-03 10:47:15 -04:00
Kyle Fiedler
e50f622915 Added styles for detailed solution 2012-09-03 10:40:38 -04:00
ichuang
4341ea7689 fix bug in modulestore reload: etree parser must be specified explicitly 2012-09-02 22:40:50 -04:00
David Ormsbee
5194dc3177 Add support for discussion_link attribute in course policy files as a kludge to support CS50's external forums 2012-09-02 22:22:01 -04:00
kimth
ea4019c0a0 Add comment to sequence/display.coffee 2012-09-01 09:01:19 -04:00
kimth
90bcb00e58 Allow ckt editor to be embedded in sequence 2012-09-01 08:56:16 -04:00
Tom Giannattasio
881404bab7 Merge pull request #602 from MITx/bug/kfiedler/sequence-nav
Added fix for the sequnce nave hovers
2012-08-31 14:01:26 -07:00
Kyle Fiedler
60ea621560 Remove problem-answer class that will now not be used 2012-08-31 16:55:50 -04:00
David Ormsbee
69ea7aa873 Merge pull request #597 from MITx/feature/victor/nested-links
Feature/victor/nested links
2012-08-31 13:48:05 -07:00
Kyle Fiedler
f2fc51bd35 Added class problem-and-answer with margin on the bottom 2012-08-31 16:08:41 -04:00
Kyle Fiedler
520256f67a Added fix for the sequnce nave hovers 2012-08-31 14:17:03 -04:00
kimth
05da125aed Merge pull request #600 from MITx/feature/kfiedler/hints
Added styles for problems
2012-08-31 10:30:50 -07:00
Kyle Fiedler
e6f9f8d9b0 Add js to the problem and move around that css and js to accomodate Tonys new HTML Structure 2012-08-31 11:15:06 -04:00
Arjun Singh
b58436545a Add note about positional modules; check for videosequence. 2012-08-31 06:45:59 -07:00
David Ormsbee
785ddb5df1 Merge pull request #584 from MITx/feature/victor/double-double-html
Fix inline html bug.
2012-08-31 05:34:22 -07:00
David Ormsbee
717223be92 Merge pull request #577 from MITx/feature/victor/fix-url_name-cleanup
Feature/victor/fix url name cleanup
2012-08-31 05:32:18 -07:00
Arjun Singh
32cb0897e9 Fixing sequentials nested inside of verticals, provides a path to sequentials nested in sequentials. Changes jump_to to redirect to courseware index. 2012-08-31 04:24:52 -07:00
kimth
a98dcd958e Let admins see answers of problems at any time 2012-08-31 07:09:54 -04:00
Victor Shnayder
d815d50aee Remove obsolete eager flag for xml modulestore
* has to be eager
2012-08-30 19:26:50 -04:00
Victor Shnayder
484735bf03 make jump_to go to right position in a sequence. 2012-08-30 18:55:38 -04:00
Victor Shnayder
021ccde1b4 Make jump_to work with the xml modulestore
* it now works in the context of a specific course_id
* add tracking of parent locations to xml modulestore
* adjust lots of tests, including some refactoring
* NOT working yet: jumping to the right position in a sequence.
2012-08-30 18:47:11 -04:00
Kyle Fiedler
1939b001e4 Added better animation in 2012-08-30 16:26:01 -04:00
Kyle Fiedler
bc288424a4 Rework styles for test results and style file upload 2012-08-30 15:22:27 -04:00
Kyle Fiedler
3be48e5012 Formatted new hints and testing blocks 2012-08-30 13:18:01 -04:00
Kyle Fiedler
a9f624115c Added styles for hints 2012-08-30 13:18:01 -04:00
David Ormsbee
8c5b203dfb Merge pull request #591 from MITx/kimth/gentler-frontend
A gentler, more helpful frontend
2012-08-30 10:10:44 -07:00
kimth
86409a2a26 Adjust comments for Sequence js 2012-08-29 22:11:26 -04:00
kimth
bb55a76379 Allow courseware to navigate to specific tabs of a sequence 2012-08-29 22:01:16 -04:00
Arjun Singh
5d6bed863a Fix discussions in xmodules 2012-08-29 16:41:01 -07:00
kimth
1fd2f0c601 Fix double show answer bug 2012-08-29 18:02:37 -04:00
Arjun Singh
5c5d11409a Temporary fix to make uncaptioned videos display reasonably. Will replace with proper solution. 2012-08-29 13:58:22 -07:00
David Ormsbee
e55bbbc736 Remove __grading_policy related items, which got in here accidentally 2012-08-29 10:58:40 -04:00
David Ormsbee
50c682e459 Merge pull request #583 from MITx/rocha/master
[#35065403] Lets video player work if subtitles cannot be loaded
2012-08-29 07:01:58 -07:00
Arjun Singh
ac65e47e21 Getting rid of an alert. People don't like alerts. 2012-08-29 03:15:30 -07:00
Victor Shnayder
fe50f94437 Fix inline html bug.
* problem was in trying to remove the outer <html> + </html> tags.
* cleaned up the stringify function to be less magical, and more
  obviously correct.

[Fix #35136297]
2012-08-28 19:54:57 -04:00
Carlos Andrés Rocha
aa063d5729 [#35065403] Lets video player continue to work if subtitles cannot be loaded 2012-08-28 18:18:37 -04:00
Arjun Singh
6a6b24af79 Disable jsresponse file compilation; done manually for now. 2012-08-28 12:40:49 -07:00
David Ormsbee
88e485315d Merge pull request #571 from MITx/feature/arjun/contextualize_js_params
Contextualizing javascript parameters
2012-08-28 11:07:49 -07:00
kimth
bad24df842 Adjust tests to reflect XML requirement for external grader messages 2012-08-28 13:31:06 -04:00
kimth
fb5501855c Merge master 2012-08-28 12:37:24 -04:00
Victor Shnayder
9277f5df8e Minor cleanups to url name checking
* better error messages
* better fallback names
* architectural TODO for later...
2012-08-28 11:27:47 -04:00
David Ormsbee
231b8c6aa4 Merge pull request #548 from MITx/kimth/limit-queue-dos
Kimth/limit queue dos
2012-08-28 08:03:02 -07:00
Arjun Singh
8ed9ab44e7 Contextualizing javascript parameters 2012-08-27 23:49:07 -07:00
kimth
377b09e170 Adjust comments 2012-08-27 20:07:54 -04:00
kimth
82a0d065a7 Use enumerate in loops 2012-08-27 20:04:48 -04:00
kimth
297df37fc0 Drop unnecessary iterator index 2012-08-27 19:59:22 -04:00
kimth
6302283183 Drop unnecessary .keys() 2012-08-27 19:57:46 -04:00
kimth
b4b8f6bc7d Use with open(file) structure 2012-08-27 19:55:21 -04:00
kimth
2919389d8e Use os.path.join -- all of them... 2012-08-27 19:53:10 -04:00