Andy Armstrong 0ed3a95d3a Merge branch 'release' ...

Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py

2014-09-25 16:25:45 -04:00

..

branding

only redirect to dashboard if user has course enrollments, otherwise remain on the course catalog page (aka homepage or root)

2014-09-15 20:52:44 -04:00

bulk_email

Fixed some isinstance errors with opaque-keys

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

certificates

Fix tests not using ModuleStoreTestCase

2014-09-17 11:16:55 -04:00

circuit

mitxmako => edxmako

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

class_dashboard

Revert "Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul""

2014-07-30 17:01:52 -04:00

course_wiki

get_courses_for_wiki return course_keys across all modulestores [LMS-2914]

2014-07-21 17:17:48 -04:00

courseware

Merge branch 'release'

2014-09-25 16:25:45 -04:00

dashboard

Quality cleanup

2014-09-08 12:02:31 -04:00

debug

Add support for UX reference templates in LMS

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

django_comment_client

TNL-171: Change topic of a previously posted post.

2014-09-24 20:28:14 +03:00

foldit

Quality cleanup

2014-09-08 12:02:31 -04:00

instructor

Merge branch 'release'

2014-09-25 16:25:45 -04:00

instructor_analytics

Add the 'meta' column from the UserProfile table to the CSV download

2014-09-23 15:08:38 -04:00

instructor_task

Remove unicode conversion of email since it should always be unicode

2014-09-15 10:58:09 -07: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

mobile_api

Merge pull request #5365 from edx/ormsbee/mobile_deleted_announcement_fix

2014-09-24 12:26:13 -04:00

notes

Merge branch 'release'

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

notification_prefs

Modify notification_pref tests to avoid changes to module store

2014-09-17 11:16:55 -04:00

oauth2_handler

Use default locale to OpenID profile claims.

2014-09-22 15:19:40 -04:00

open_ended_grading

get_items API: have qualifiers be a separate parameter instead of assuming kwargs.

2014-08-08 12:38:42 -04:00

psychometrics

Fixed problems with psychometrics

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

shoppingcart

be sure to constrain the select to the course_id that is being delete

2014-09-22 21:46:11 -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

student_account

Added test for email activation and confirmation

2014-09-25 09:46:02 -04:00

student_profile

Add Django apps for student account and profile.

2014-09-25 08:36:22 -04:00

verify_student

Merge pull request #5154 from edx/diana/pass-along-course-id

2014-09-10 14:58:26 -04:00