David Ormsbee 43d8c7a712 Merge branch 'release' ...

Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py

2014-11-13 10:11:12 -05:00

..

branding

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

bulk_email

Fix PEP8: E303 too many blank lines

2014-11-10 11:00:14 -08:00

certificates

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

circuit

mitxmako => edxmako

2013-12-03 14:15:09 -05:00

class_dashboard

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

course_wiki

Unit Test Improvements

2014-10-31 11:55:13 +00:00

courseware

Merge branch 'release'

2014-11-13 10:11:12 -05:00

dashboard

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

debug

Add support for UX reference templates in LMS

2014-09-11 13:52:48 -04:00

django_comment_client

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

foldit

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

instructor

Merge branch 'release'

2014-11-13 10:11:12 -05:00

instructor_analytics

EX-71 New shopping Cart UI Single person purchase

2014-10-19 21:50:29 -04:00

instructor_task

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

licenses

Unit Test Improvements

2014-10-31 11:55:13 +00:00

linkedin

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

lms_migration

Fix PEP8: E303 too many blank lines

2014-11-10 11:00:14 -08:00

mobile_api

Fix broken test (due to merge conflict).

2014-11-06 09:19:40 -05:00

notes

Merge branch 'release'

2014-06-11 21:30:05 -04:00

notification_prefs

Fix PEP8: E231 missing whitespace after '[:,]'

2014-11-10 19:31:05 -08:00

notifier_api

fixup! Make notifier API resilient to bad enrollments

2014-10-03 14:40:37 -04:00

oauth2_handler

Merge pull request #5749 from rocha/cache-oauth2-handler-course-values

2014-11-07 14:38:09 -05:00

open_ended_grading

Fix PEP8: E231 missing whitespace after '[:,]'

2014-11-10 19:31:05 -08:00

psychometrics

Fixed problems with psychometrics

2014-09-17 11:25:00 -04:00

shoppingcart

Merge branch 'release'

2014-11-13 10:11:12 -05:00

static_template_view

mitxmako => edxmako

2013-12-03 14:15:09 -05:00

staticbook

Fix PEP8: E231 missing whitespace after '[:,]'

2014-11-10 19:31:05 -08:00

student_account

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

student_profile

Use Backbone for student account and profile JS.

2014-10-08 15:50:13 -04:00

survey

Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course

2014-10-30 13:11:02 -04:00

verify_student

Fix PEP8: E303 too many blank lines

2014-11-10 11:00:14 -08:00