John Jarvis 7023eb4c19 resolving merge conflicts

2014-07-21 13:42:06 -04:00

..

analytics

adds user id to student profile information (LMS-2791)

2014-06-02 15:49:46 -04:00

branding

Update tests to allow LMS tests to use published branch setting.

2014-07-09 21:10:12 -04:00

bulk_email

Fixed some isinstance errors with opaque-keys

2014-07-11 15:40:08 -04:00

certificates

Moved GeneratedCertificates.MODES back inside model.

2014-07-01 19:46:51 +05:00

circuit

mitxmako => edxmako

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

class_dashboard

Enables LMS to handle deprecated URLs

2014-07-09 21:51:37 +00:00

course_wiki

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00

courseware

Merge pull request #4450 from Stanford-Online/jbau/edx/fix-shib-student-register

2014-07-17 13:53:51 -04:00

dashboard

Fix all modulestore calls to pass in user ids.

2014-07-09 21:10:12 -04:00

debug

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

django_comment_client

Fixed some isinstance errors with opaque-keys

2014-07-11 15:40:08 -04:00

foldit

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00

instructor

Merge pull request #4450 from Stanford-Online/jbau/edx/fix-shib-student-register

2014-07-17 13:53:51 -04:00

instructor_task

Fixed some isinstance errors with opaque-keys

2014-07-11 15:40:08 -04:00

licenses

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00

linkedin

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-09 15:29:32 -04:00

lms_migration

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

notes

Merge branch 'release'

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

notification_prefs

Notifier re-subcribe via link

2014-01-22 09:54:27 -08:00

open_ended_grading

Merge branch 'release'

2014-06-10 16:59:23 -04:00

psychometrics

Opaque-keys: fix pylint violations

2014-05-24 19:36:09 -04:00

shoppingcart

add ability to inspect a cart for the existence of a particular type of item, e.g. PaidCourseRegistration. Only show the 'Shopping Cart' button if there's a PaidCourseRegistration in it.

2014-07-17 00:43:00 -04:00

static_template_view

mitxmako => edxmako

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

staticbook

Pass storage_url and token values as parameters to StudentNotes init.

2014-06-23 16:38:02 +05:00

verify_student

Merge pull request #4353 from edx/flowerhack/lms-deprecated-urls

2014-07-09 18:23:00 -04:00