Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
109d3c3d100f67fe2b49feecddd6573dcf37d027
edx-platform/lms/djangoapps
History
Will Daly 96c2a50370 Merge branch 'master' into will/use-mixed-modulestore-in-tests 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/django.py
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/courseware/tests/tests.py
2013-08-21 10:12:24 -04:00
..
analytics
Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.
2013-08-14 13:23:06 -04:00
branding
WIP
2013-08-15 22:58:02 -04:00
certificates
convert all datetime.now() to datetime.now(UTC)
2013-07-22 17:39:11 -04:00
circuit
Remove pointless addition tests
2013-06-27 16:27:39 -04:00
course_modes
Add in a uniqueness constraint on mode, course, and currency.
2013-08-16 15:26:57 -04:00
course_wiki
Removed unnecessary settings wrangling from ModuleStoreTestCase.
2013-08-21 09:36:45 -04:00
courseware
Merge branch 'master' into will/use-mixed-modulestore-in-tests
2013-08-21 10:12:24 -04:00
dashboard
Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.
2013-08-14 13:23:06 -04:00
debug
Remove unused imports from lms, as detected by pylint.
2013-06-19 16:56:34 -04:00
django_comment_client
Removed unnecessary settings wrangling from ModuleStoreTestCase.
2013-08-21 09:36:45 -04:00
foldit
change models to filter by course
2013-07-19 11:03:25 -04:00
instructor
Merge branch 'master' into will/use-mixed-modulestore-in-tests
2013-08-21 10:12:24 -04:00
instructor_task
Removed unnecessary settings wrangling from ModuleStoreTestCase.
2013-08-21 09:36:45 -04:00
licenses
Removed unnecessary settings wrangling from ModuleStoreTestCase.
2013-08-21 09:36:45 -04:00
lms_migration
Pylint complains if you use string, even if you use it for what its still meant to be used for.
2013-06-21 16:35:47 -04:00
multicourse
Remove simplewiki from the codebase
2013-06-20 09:06:29 -04:00
notes
Add a manage.py command that understands the extra edX options
2013-07-24 09:04:12 -04:00
notification_prefs
notification_prefs/views: correct docstring
2013-07-30 02:30:45 -04:00
open_ended_grading
Removed unnecessary settings wrangling from ModuleStoreTestCase.
2013-08-21 09:36:45 -04:00
psychometrics
Change wildcard imports into specific imports
2013-06-21 17:33:06 -04:00
static_template_view
Remove static_template_view tests
2013-07-09 12:54:50 -04:00
staticbook
Removed unnecessary settings wrangling from ModuleStoreTestCase.
2013-08-21 09:36:45 -04:00
user_api
make user_api compatible with HTTP basic auth
2013-07-30 17:13:48 -04:00