Will Daly 2436d59e14 Merge branch 'master' into feature/deena/testing ...

Conflicts:
	cms/djangoapps/contentstore/tests/factories.py
	lms/djangoapps/courseware/tests/test_access.py

2013-03-04 16:30:41 -05:00

..

features

Pep8fix lettuce test code

2013-02-19 16:46:32 -05:00

management

Pep8 autofixes

2013-02-06 11:13:50 -05:00

migrations

switch to using timelimit module for Pearson test

2013-02-07 15:57:43 -05:00

tests

Merge branch 'master' into feature/deena/testing

2013-03-04 16:30:41 -05:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

access.py

Fix bug where we weren't combining org_staff with built-in staff for group checking

2013-03-01 10:54:57 -05:00

admin.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

courses.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

grades.py

merge

2013-02-14 12:49:14 -05:00

models.py

cosmetic changes

2013-02-08 13:42:54 -05:00

module_render.py

Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule

2013-02-19 10:43:55 -05:00

progress.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

tabs.py

first pass at pdfbook

2013-02-13 18:01:44 -05:00

urls.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

views.py

Merge branch 'master' into bugfix/dave/too_many_sql_queries

2013-03-01 10:11:35 -05:00