Adam Palay cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py

2014-09-05 13:20:15 -04:00

..

branding

Updating the platform header styles to match new site styles.

2014-08-22 18:25:45 +00: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

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

Update mongo counts.

2014-09-04 18:14:13 -04:00

dashboard

Updating the footer for edx.org and open edx.

2014-08-25 15:33:43 +00:00

debug

A debug view for seeing the URL params

2014-07-24 16:11:20 -07:00

django_comment_client

Implement forum cohort visibility labels correctly

2014-09-04 13:47:48 -04:00

foldit

Move to OpaqueKey implementations from the external library

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

instructor

Remove client side parsing of module_id

2014-09-03 21:59:29 -04:00

instructor_analytics

Implement mediated bulk purchase epic

2014-09-02 13:03:24 -04:00

instructor_task

add tracking for memory usage in creating subtasks (LMS-6488)

2014-08-27 11:12:52 -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

Implemented process_response method to clear requestcontext global variable in mako middleware.

2014-08-06 19:58:20 +05: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

Opaque-keys: fix pylint violations

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

shoppingcart

Implement mediated bulk purchase epic

2014-09-02 13:03:24 -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

Handle the indexerror exception on create_order

2014-09-02 19:08:53 +05:00