Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

65817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
46a1c43c76 Give a general purpose rake command for running django-admin in the right way for either the lms or the cms 2012-06-06 14:41:48 -04:00
Calen Pennington
8728b417f1 Make truefalse test point to the correct test file 2012-06-06 14:25:23 -04:00
Calen Pennington
dc2dc1f0dd Make it possible to run cleanliness stuff on lms 2012-06-06 14:23:09 -04:00
Calen Pennington
54756bf5e2 Use relative includes in settings files 2012-06-06 14:16:28 -04:00
Calen Pennington
fa42022ea7 Fixing another static files link 2012-06-06 14:15:33 -04:00
Calen Pennington
97a9a66c52 Move CAPA problem specific xml parsing utilities out of content_parser into xmodule 2012-06-06 14:15:33 -04:00
Calen Pennington
c76bab6f3e Get rid of unused includes 2012-06-06 14:15:33 -04:00
Calen Pennington
91b306b35a Moving capa and xmodule out of djangoapps/courseware, and removing django references from them 2012-06-06 14:15:32 -04:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00
Calen Pennington
7d0938a3df Adding logging to symmath, and skipping a test that currently fails due to environment issues 2012-06-06 11:58:04 -04:00
Calen Pennington
8d9b242e42 Get rid of unused code 2012-06-06 10:26:28 -04:00
Calen Pennington
eec80426f2 Python leaks variables from list comprehensions (Why, Python, why?) which breaks any later attempts to use the path module 2012-06-06 09:18:04 -04:00
Calen Pennington
bf032e6386 Merge pull request #67 from MITx/dogfood 
Dogfood
 2012-06-06 06:07:22 -07:00
ichuang
d25c8f08ff fixes to quickedit and dogfood to use new static/coffee/* and ajax 2012-06-05 23:15:08 -04:00
ichuang
75e36e837e fixed mistake in capa_module missing ajax_url in string format 2012-06-05 23:14:32 -04:00
ichuang
61c4a1da3d fix dogfood.views and courseware.capa.responsetypes from merge; fix main.html 2012-06-05 22:16:26 -04:00
ichuang
079166a4c5 Merge branch 'dogfood' of github.com:MITx/mitx into dogfood 
Conflicts:
	templates/mathjax_include.html
 2012-06-05 21:44:08 -04:00
ichuang
71db490a10 added MITX_FEATURES['USE_DJANGO_PIPELINE'] to env.common, fix main.html accordingly 2012-06-05 21:41:39 -04:00
Prem Sichanugrist
5991829723 Fix Jasmine test failure after bf76894f 
Sequence content does not double-escaped anymore, and eval() usage was
also removed from the sequence module.
 2012-06-05 16:47:46 -04:00
Calen Pennington
970f6af385 Merge pull request #70 from MITx/kf-minor-ui 
Kf minor ui
 2012-06-05 12:17:52 -07:00
Calen Pennington
aa016e289f Merge pull request #82 from MITx/ps-fix-player 
Fix Youtube player glitches on iOS
 2012-06-05 12:15:38 -07:00
Calen Pennington
568ebad90a Merge remote-tracking branch 'origin/dogfood' into dogfood 2012-06-05 14:40:11 -04:00
Calen Pennington
8575ed439d Merge branch 'master' into dogfood 
Conflicts:
	djangoapps/courseware/capa/responsetypes.py
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/html_module.py
	djangoapps/courseware/modules/seq_module.py
	djangoapps/courseware/modules/x_module.py
	djangoapps/courseware/views.py
	templates/main.html
	templates/problem.js
	templates/textbox.html
 2012-06-05 14:38:49 -04:00
ichuang
fc791ad852 more minor exception handling changes to capa_module 2012-06-05 13:22:24 -04:00
ichuang
c54f895199 cleaned up exception handling in capa_module 2012-06-05 13:12:04 -04:00
ichuang
b36d0dd907 raise helpful error in NumericalResponse when missing required "answer" attribute 2012-06-04 18:13:49 -04:00
ichuang
613ff49df9 use getattr(system,'DEBUG',False) in capa_problem, and log.error in responsetypes 2012-06-04 17:29:56 -04:00
ichuang
c124bb95fb move quickedit* from courseware.views to dogfood.views ; now dogfood 
is completely contained within lib/dogfood, and it can be cleanly unplugged
from the rest of the code.
 2012-06-04 17:19:05 -04:00
Prem Sichanugrist
c380bd82aa Fix subtitle scroll and hide subtitle transition 2012-06-04 15:30:56 -04:00
Prem Sichanugrist
6f9870f75f Hide the caption first when on the iOS browser 
This prevent user from prematurely seeking the video.
 2012-06-04 15:30:56 -04:00
Prem Sichanugrist
3b0a1b7ee2 Fix test variable leakage 2012-06-04 15:30:56 -04:00
Prem Sichanugrist
3f7dc68828 Lazily build video slider when on iOS device 
This will fix the problem when user trying to click the seek button on
the iOS, as the video need to be started first before it can be
seekable.
 2012-06-04 15:30:56 -04:00
Kyle Fiedler
382dc62173 Added styles for non play button 2012-06-04 15:30:56 -04:00
Kyle Fiedler
a6852eefb8 Sprited vcr controlls and added default bg image 2012-06-04 15:30:55 -04:00
Prem Sichanugrist
fe849dedd9 Do not display play/pause button on iOS Device 
iOS devices has a restriction that user has to click on the video
element to initiate playback. By visually disable the button, user will
be forced to click on the video itself, and everything will be worked as
expected.

Fixes https://www.pivotaltracker.com/story/show/30334381
 2012-06-04 15:30:55 -04:00
Calen Pennington
7cf4b1597c Be more direct about where modx_dispatch is located and where it is used 2012-06-04 09:19:00 -04:00
ichuang
7c33537bf4 dogfood still has the codemirror + chrome bug; put in warning message 
for now
 2012-06-03 22:47:01 -04:00
ichuang
dc84a20ff5 improve error handling in external response; centralize interaction 
with external server into ExternalResponse.do_external_request
 2012-06-03 07:43:18 -04:00
ichuang
1aa05fd400 externalresponse fixes; clean up semantics of interface, add command 
for getting expected answer from external server, add error handling,
extend to use json for multiple input fields, added rows & cols to
textbox inputtype for code input.
 2012-06-02 23:06:11 -04:00
ichuang
b1acec7cc9 (local to dogfood - don't pull to master) changes to main.html 2012-06-02 23:05:37 -04:00
ichuang
1527a1e387 problem.js: change "show answer" to put result in .html instead of .text (OK everyone?) 
also some changes to try to fix the codemirror problem
 2012-06-02 23:03:58 -04:00
ichuang
652aaff78e workaround for codemirror bug on chrome - click "show answer" does codemirror.refresh() 2012-06-02 20:48:07 -04:00
ichuang
4ff3a8735c add sympy to requirements.txt 2012-06-02 19:03:16 -04:00
ichuang
c563bef133 README for dynamath 2012-06-02 19:01:33 -04:00
ichuang
efdcf7096c symbolicresponse.xml test file 2012-06-02 18:59:54 -04:00
ichuang
164e17a8d7 symbolicresponse test cases; tests pass. improved some error handling, 
cleaned up some cruft prints -> logging
 2012-06-02 18:58:58 -04:00
ichuang
361c68f8af another fix to dynamath display timing - problem.js content_updated display 2012-06-02 17:57:37 -04:00
ichuang
2f33bce7ad symbolic math: add <symbolicresponse> type; improve error handling in 
symmath library; add options for matrices, qubit to symmath_check
 2012-06-02 17:17:48 -04:00
ichuang
9dab2ce4e7 dynamic math rendering timing - had issue with display disappearing 
after click due to call to content_updated(); fixed this.
 2012-06-02 17:17:00 -04:00
ichuang
68a2e7c079 dynamic math display - fix sequence of mathjax timing (mathml now 
generated when Check is clicked)
 2012-06-02 17:08:53 -04:00