Commit Graph

4251 Commits

Author SHA1 Message Date
Calen Pennington
897a87646c Make progress handle extra credit by capping at 100%, and handle malformed progress stuff by ignoring any changes 2012-09-06 15:16:24 -04:00
kimth
032869744b cktsim-in-schematic 2012-09-06 15:12:52 -04:00
Calen Pennington
34f2309c15 Merge pull request #631 from MITx/feature/victor/url_name-duplication
fix for multiple url_name hashing bug
2012-09-06 08:32:14 -07:00
Kyle Fiedler
3ab85d470a Fix before element 2012-09-06 10:39:19 -04:00
Kyle Fiedler
54f621a329 Added fix for pre as a first child in a list item 2012-09-06 10:21:34 -04:00
Victor Shnayder
739dd8e3f9 fix for multiple url_name hashing bug 2012-09-06 10:12:48 -04:00
Victor Shnayder
4481adb041 Track current chapter.
- courseware index view now redirects to most recent chapter, or first
- simplify the view a bit
2012-09-05 16:15:53 -04:00
Victor Shnayder
6cfe52680b Fix XModule __unicode__ method
- was referencing no-longer-present attributes
2012-09-05 16:15:53 -04:00
Kyle Fiedler
7c8838a6b2 Added some different style for the select problems 2012-09-05 15:02:50 -04:00
Kyle Fiedler
f785f6f8a1 Added some nicer styles for dynamic math 2012-09-05 14:24:12 -04:00
Kyle Fiedler
8a5e872c8f Removed a bunch of font tags 2012-09-05 14:24:12 -04:00
David Ormsbee
5e9fce5cae Merge branch 'master' into feature/halogenandtoast/calculator 2012-09-05 13:58:12 -04:00
Calen Pennington
7702907662 Make module system handle not having a user, and pass a user in when previewing in the cms 2012-09-05 13:29:30 -04:00
Calen Pennington
82c877c036 Merge pull request #598 from MITx/kimth/solutions
Let admins see answers of problems at any time
2012-09-05 08:24:45 -07:00
Calen Pennington
a0608df706 Merge pull request #621 from MITx/feature/victor/fewer-xml-warnings
Remove lots of loud warnings about duplicate url names for things which ...
2012-09-05 08:17:02 -07:00
Calen Pennington
54e8819fb1 Merge pull request #615 from MITx/feature/ichuang/instructor-dashboard-upgrade
Upgrade to instructor dashboard
2012-09-05 08:03:55 -07:00
Victor Shnayder
c23b31c6ee Remove lots of loud warnings about duplicate url names for things which don't store state, and have the same hash.
- should make 6.002 discussion tags happier
2012-09-04 16:20:39 -04:00
Arjun Singh
93ed042786 Make show answer work for choicegroups + javascriptinputs 2012-09-03 19:37:48 -07:00
ichuang
520d5620d0 more general catch for gunicorn sync error 2012-09-03 20:37:33 -04:00
ichuang
dbeca659bd suppress gunicorn error which is being caught by errortracker. The
gunicorn error is of this form:

Traceback (most recent call last):
  File "/home/ike/mitx_all/python/local/lib/python2.7/site-packages/gunicorn/workers/sync.py", line 33, in run
    client, addr = self.socket.accept()
  File "/usr/lib/python2.7/socket.py", line 202, in accept
    sock, addr = self._sock.accept()
error: [Errno 11] Resource temporarily unavailable
2012-09-03 20:32:07 -04:00
Victor Shnayder
f926925ca6 Add a hide_progress_tab course policy flag
- for internal cs50 until we have grade integration set up (only really needed for external version)
2012-09-03 14:12:43 -04:00
Victor Shnayder
79109a6244 Apply attr_map translation to metadata loaded from policy file as well as from xml. 2012-09-03 13:51:20 -04:00
kimth
c26126d8d6 Merge pull request #617 from MITx/feature/kfiedler/detailed-answer
Added styles for detailed solution
2012-09-03 08:14:03 -07:00
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