Christine Lytwynec 96e5139d66 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/tests/test_video.py

2014-06-25 13:51:31 -04:00

..

analytics

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

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

branding

Fixed register button on edge homepage.

2014-05-22 12:09:23 +05:00

bulk_email

Change Location, CourseLocator, etc to reference opaque-keys library

2014-05-30 20:32:38 +00:00

certificates

Merge pull request #4075 from edx/han/regenerate_user

2014-06-13 11:39:56 -04: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 branch 'release'

2014-06-25 13:51:31 -04:00

dashboard

Fix variable names to give context for translators

2014-06-18 23:28:39 -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

Remember the user last thread sort preference

2014-06-18 14:26:30 +05:00

foldit

Move to OpaqueKey implementations from the external library

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

instructor

Fix variable names to give context for translators

2014-06-18 23:28:39 -04:00

instructor_task

Merge pull request #3931 from edx/sarina/fixup-external-opaque-keys-impls

2014-05-29 18:23: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

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