Adam Palay 35e4e9d81f resolve more merge conflicts

2015-03-19 17:22:29 -04:00

..

branding

Fix or remove tearDown methods that don't use super.

2015-03-17 15:14:52 -04:00

bulk_email

Fix or remove tearDown methods that don't use super.

2015-03-17 15:14:52 -04:00

certificates

Merge pull request #7345 from edx/talbs/certs-webview-uicleanup

2015-03-18 13:16:24 -04:00

circuit

Fix Pylint: W0613(unused-argument)

2015-02-19 19:56:51 -08:00

class_dashboard

Remove unused imports

2015-03-17 07:10:31 -04:00

commerce

resolve more merge conflicts

2015-03-19 17:22:29 -04:00

course_structure_api

Reorganized course_structures app

2015-03-10 11:12:51 -04:00

course_wiki

Remove unused imports

2015-03-17 07:10:31 -04:00

courseware

Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master

2015-03-19 16:30:46 -04:00

dashboard

Fix or remove tearDown methods that don't use super.

2015-03-17 15:14:52 -04:00

debug

Add support for UX reference templates in LMS

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

django_comment_client

Merge pull request #7356 from edx/ned/fix-or-remove-teardown

2015-03-18 17:36:17 -04:00

edxnotes

Remove unused imports

2015-03-17 07:10:31 -04:00

foldit

Silence unrelated warnings

2015-03-14 13:35:18 -07:00

instructor

Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master

2015-03-19 16:30:46 -04:00

instructor_analytics

Remove unused imports

2015-03-17 07:10:31 -04:00

instructor_task

Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master

2015-03-19 16:30:46 -04:00

licenses

Remove unused imports

2015-03-17 07:10:31 -04:00

lms_migration

Silence unrelated warnings

2015-03-14 13:35:18 -07:00

lms_xblock

Add caching to partitions_service.

2015-03-18 14:55:16 -04:00

mobile_api

Use depth=0 for call to cache_for_descriptor_descendents.

2015-03-18 14:55:15 -04:00

notes

Fix Pylint: E0012(bad-option-value)

2015-02-19 19:56:51 -08:00

notification_prefs

Remove unused imports

2015-03-17 07:10:31 -04:00

notifier_api

Silence unrelated warnings

2015-03-14 13:35:18 -07:00

oauth2_handler

Add the preferences endpoint to the User API

2015-03-16 23:34:35 -04:00

open_ended_grading

Remove unused imports

2015-03-17 07:10:31 -04:00

psychometrics

Fixed problems with psychometrics

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

shoppingcart

Merge pull request #7356 from edx/ned/fix-or-remove-teardown

2015-03-18 17:36:17 -04:00

static_template_view

Prep marketing iframe and relevant courseware view for email opt-in

2014-12-01 10:30:16 -05:00

staticbook

Remove unused imports

2015-03-17 07:10:31 -04:00

student_account

Remove unused imports

2015-03-17 07:10:31 -04:00

survey

Remove unused imports

2015-03-17 07:10:31 -04:00

verify_student

Remove unused imports

2015-03-17 07:10:31 -04:00

__init__.py

Add a configuration model for managing XBlockAsides

2014-12-12 21:45:21 -05:00