Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,625 Commits 1 Branch 0 Tags
eab11bca428cdc061de065eb27ff877c8400a7a0
Commit Graph

1192 Commits

Author SHA1 Message Date
kimth
eab11bca42 Mathjax preprocessor is course-specific 2012-09-09 14:04:52 -04:00
kimth
f9c31f3f42 Add comments 2012-09-09 13:16:22 -04:00
kimth
4881d54a49 Need to escape keywords such as 'in' from MathJax 2012-09-09 13:12:51 -04:00
kimth
2b17fb626b Translate between 6.002x subscript convention and standard Latex 2012-09-09 10:53:32 -04:00
Calen Pennington
b85fefe61a Fixing tests that were failing to due static content directory change 2012-09-07 17:02:00 -04:00
David Ormsbee
8312ddf01d Merge pull request #629 from MITx/feature/victor/save-course-position 
Feature/victor/save course position
 2012-09-07 06:42:48 -07:00
David Ormsbee
e4c261ba37 Merge pull request #637 from MITx/kimth/cktsim-in-schematic 
cktsim-in-schematic
 2012-09-07 06:30:45 -07:00
Victor Shnayder
8b7390c966 Turn of discussion service in test env 
- add a check for the feature flag before trying to save user info to the service
 2012-09-06 17:11:21 -04:00
Victor Shnayder
048dea0eff make test course loading deterministic by using course_id 2012-09-06 16:38:33 -04:00
David Ormsbee
bea6db620a Merge pull request #533 from MITx/feature/halogenandtoast/calculator 
Put in calculator in courseware
 2012-09-06 13:00:09 -07:00
Calen Pennington
8030fdce80 Fix test and assertion reversal in progress test 2012-09-06 15:47:45 -04:00
Calen Pennington
5f261ec335 Test that values are clamped between 0 and 100% for progresses 2012-09-06 15:47:12 -04:00
Calen Pennington
5ce516a3a0 Clamp progress to be greater than zero 2012-09-06 15:23:19 -04:00
Calen Pennington
14eb160eea Just return a null progress if something goes wrong when retrieving capa_module progress (and log the error) 2012-09-06 15:18:59 -04:00
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
5a137cf3ec Merge pull request #625 from MITx/feature/ichuang/fix-force-univ-domain 
fix FORCE_UNIVERSITY_DOMAIN check in student.views
 2012-09-05 08:22:24 -07:00
Calen Pennington
8c301e04ae Merge pull request #614 from MITx/feature/arjun/fix_customresponse_msg 
Clean up customresponse messages + points
 2012-09-05 08:20:54 -07:00
ichuang
34ea1e0b95 fix FORCE_UNIVERSITY_DOMAIN check in student.views 2012-09-05 11:19:02 -04: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
ichuang
0c3d054253 fix: university domain should not be determined by HTTP_HOST for dev or behind proxy 2012-09-04 18:36:26 -04: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
ichuang
4f8161df84 address two comments in https://github.com/MITx/mitx/pull/615 2012-09-04 11:10:22 -04:00
ichuang
258274f2a7 add string to model class unicode 2012-09-04 10:25:28 -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
ichuang
a973c1c21e use module.descriptor.start for start date in xmodule_modifiers 2012-09-03 16:49:55 -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
ichuang
9e8ec09b4d pep8 fixes 2012-09-02 20:15:57 -04:00