edx-platform

Files

Will Daly 48bc4776be Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form

Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py

2014-10-28 15:16:27 -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

Consistently ensure dog_stats_api tags are formatted correctly

2014-10-09 12:35:26 -07:00

certificates

Consistently ensure dog_stats_api tags are formatted correctly

2014-10-09 12:35:26 -07: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

Redirect users to the track selection page or ?next page when using third party auth

2014-10-28 10:28:30 -04:00

dashboard

Added handling in gitlog for missing import logs

2014-10-10 10:41:06 -04:00

debug

Add support for UX reference templates in LMS

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

django_comment_client

Merge branch 'release'

2014-10-16 20:11:55 -04:00

foldit

Quality cleanup

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

instructor

WL-98

2014-10-21 14:23:46 -04:00

instructor_analytics

EX-71 New shopping Cart UI Single person purchase

2014-10-19 21:50:29 -04:00

instructor_task

Create standard way of updating a task's progress

2014-10-15 15:58:08 -04:00

licenses

Move to OpaqueKey implementations from the external library

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

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

Platform API doc

2014-10-17 12:27:45 -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

notifier_api

fixup! Make notifier API resilient to bad enrollments

2014-10-03 14:40:37 -04:00

oauth2_handler

List all courses during OAut2/OpenID Connect

2014-10-03 14:15:41 -04:00

open_ended_grading

Consistently ensure dog_stats_api tags are formatted correctly

2014-10-09 12:35:26 -07:00

psychometrics

Fixed problems with psychometrics

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

shoppingcart

Merge branch 'release'

2014-10-23 19:41:31 +00:00

static_template_view

mitxmako => edxmako

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

staticbook

Disable http range requests in pdf.js.

2014-10-01 18:12:30 +05:00

student_account

Integrate third party auth into the combined login/registration page.

2014-10-22 17:10:49 -04:00

student_profile

Integrate third party auth into the combined login/registration page.

2014-10-22 17:10:49 -04:00

verify_student

Clean up after track selection experiment

2014-10-14 13:56:49 -04:00