Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,135 Commits 1 Branch 0 Tags
92c6f1e63d997f1ccbdc3cabc54d80bafa678de8
Commit Graph

2135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
92c6f1e63d Add reports for library tests 2012-06-07 16:54:05 -04:00
Bridger Maxwell
997c24f9e6 Merge branch 'master' of github.com:MITx/mitx 2012-06-07 16:50:01 -04:00
Bridger Maxwell
8a523997b1 Added setting for new changes to django-pipeline. Only sass is recompiled each time now. 2012-06-07 16:49:51 -04:00
Calen Pennington
698fea8444 Make run.sh just run the relevant rake lms command 2012-06-07 16:38:18 -04:00
Calen Pennington
3f32e5bb3c Fix minor issue with an incomplete carry through of a name change 2012-06-07 16:36:39 -04:00
David Ormsbee
3f545511ba Merge pull request #89 from MITx/cpennington/courseware_documentation 
Update documentation for functions inside common/xmodule
 2012-06-07 11:22:15 -07:00
David Ormsbee
f28cba2a50 Merge pull request #88 from MITx/cpennington/courseware_tests 
Move courseware tests into the common/xmodule library
 2012-06-07 11:21:37 -07:00
Calen Pennington
d5e0fb3e69 Renaming item to only_one, and adding documentation 2012-06-07 11:48:23 -04:00
Calen Pennington
5101e575ba Adding documentation for parse_timedelta 2012-06-07 11:46:01 -04:00
Bridger Maxwell
d7957424fe Missing import was causing courseware errors 2012-06-07 11:33:54 -04:00
Calen Pennington
08220e09f7 Doing some stylistic cleanup on capa_module.py 2012-06-07 11:26:40 -04:00
Calen Pennington
6a13d3bba8 Documenting customtag format, and making it less brittle 2012-06-07 11:04:39 -04:00
Calen Pennington
a83fdc71f9 Document the aggregate_scores function 2012-06-07 10:46:10 -04:00
Calen Pennington
4a0969df9d Move tests for xmodules into the xmodule library, and make them run without django 2012-06-07 10:46:10 -04:00
Calen Pennington
bbfc1828cc Merge pull request #87 from MITx/victor/fix-multicourse-settings 
Fix is_valid_course() in multicourse_settings
 2012-06-07 07:17:17 -07:00
Victor Shnayder
d61523ca39 Fix is_valid_course() in multicourse_settings 
* Wasn't passing coursename through to get_course_settings
 2012-06-06 16:54:43 -04:00
Calen Pennington
d8c05cc520 Merge pull request #86 from MITx/victor/fix-requirements 
Fix django-pipeline requirement url
 2012-06-06 12:51:34 -07:00
Victor Shnayder
57d4dfb97f Fix django-pipeline requirement url 
* Add "git+" to start of django-pipeline url.  Fixes dev install on my system.
 2012-06-06 15:45:47 -04:00
pmitros
7b351e9b78 Merge pull request #84 from MITx/cms_reorg 
Reorganization of course tree. 
Several minor comments, but they can be cleaned up after the merge.
 2012-06-06 12:43:23 -07:00
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