Chris Dodge
|
3b5e17ef55
|
Merge branch 'master' into feature/cdodge/cms-master-merge2
Conflicts:
.gitmodules
common/djangoapps/__init__.py
common/djangoapps/track/migrations/__init__.py
common/lib/capa/capa/inputtypes.py
common/lib/capa/capa/responsetypes.py
common/lib/capa/capa/templates/openendedinput.html
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/video_module.py
common/static/sass/bourbon/css3/_box-sizing.scss
doc/development.md
lms/djangoapps/instructor/tests.py
lms/envs/aws.py
lms/envs/common.py
lms/templates/video.html
requirements.txt
test-requirements.txt
|
2013-01-07 12:34:48 -05:00 |
|
Jay Zoldak
|
fd902165c0
|
Add splinter to test-requirements.txt
|
2013-01-03 12:34:54 -05:00 |
|
Jay Zoldak
|
d5111b9ed9
|
Get lettuce tests running against test database
|
2013-01-02 10:44:21 -05:00 |
|
Jay Zoldak
|
668bc81d7f
|
New branch for clean lms acceptance tests
|
2013-01-02 10:44:19 -05:00 |
|
Jay Zoldak
|
0654665b20
|
Enable XModule factories to work with the currently version of Factory Boy at PyPI (1.2.0) so that the code will work with 'pip install factory_boy'
|
2012-11-15 11:40:29 -05:00 |
|
Calen Pennington
|
3c9b2e3deb
|
Add pylint and pep8 to test deps
|
2012-05-15 14:53:23 -04:00 |
|
Calen Pennington
|
a7995df63c
|
Use the django-nose test runner, for the coverage features
|
2012-05-14 16:36:50 -04:00 |
|