Adam Palay d63a5abfbc Merge branch 'rc/2014-07-02' into testmergemaster ...

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py

2014-07-07 13:54:03 -04:00

..

analytics

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

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

branding

Enable Mixed Modulestore STUD-1540

2014-06-26 18:00:11 -04:00

bulk_email

ModulestoreEnum class.

2014-06-27 14:37:35 -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

Use ngettext rather than "word(s)" for plural phrases

2014-06-17 13:25:46 -04:00

course_wiki

Move to OpaqueKey implementations from the external library

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

courseware

Merge pull request #4038 from edx/anton/redirect-on-error

2014-07-01 17:03:09 +03:00

dashboard

Merge pull request #4210 from bdero/bdero/fix-sysadmin-dashboard-gitlog-timezone

2014-06-30 14:33:01 -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

Merge pull request #4216 from edx/jsa/new-post-redesign

2014-06-30 14:39:46 -04:00

foldit

Move to OpaqueKey implementations from the external library

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

instructor

Use deprecated course_key when calling the analytics API.

2014-07-03 12:25:16 -04:00

instructor_task

Enable Mixed Modulestore STUD-1540

2014-06-26 18:00:11 -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

Merge branch 'release'

2014-06-10 16:59:23 -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 branch 'release'

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