edx-platform

Files

Carlos Andrés Rocha 7d618f26ca Merge branch 'release'

Conflicts:
	lms/djangoapps/courseware/features/video.feature

2014-03-29 20:37:49 -04:00

analytics

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

branding

Merge pull request #2738 from edx/dbarch/mixed_ms_router

2014-03-05 17:17:07 -05:00

bulk_email

Consolidate course_id triple parsing

2014-02-24 11:45:59 -05:00

certificates

Certificates: Additional flags for regenerate_user

2014-03-18 10:57:10 -07:00

circuit

mitxmako => edxmako

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

class_dashboard

New tab (Metrics) in instructor dashboard

2014-02-28 14:01:44 -08:00

course_wiki

Merge pull request #3070 from edx/adam/middleware

2014-03-26 16:36:17 -04:00

courseware

Merge branch 'release'

2014-03-29 20:37:49 -04:00

dashboard

use unicode strings for slug and regex

2014-03-21 15:48:29 +05:00

debug

Enable pure XBlocks, but behind a feature flag

2014-01-10 11:40:03 -05:00

django_comment_client

Use requests library utility method for getting json results

2014-03-28 11:37:43 -04:00

foldit

Remove unused imports.

2014-02-10 14:07:50 -05:00

instructor

fix raw grade dump in standard instructor dashboard

2014-03-28 11:10:14 -04:00

instructor_task

Generalize grade report to allow display of any report

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

licenses

Update factory_boy to 2.2.1

2013-12-05 15:50:49 -05:00

Change the from address for LinkedIn emails

2014-01-30 11:58:28 -05:00

lms_migration

Update logging.getLogger() calls to use edx instead of mitx

2013-12-04 15:18:15 -05:00

multicourse

MITX_ROOT_URL => EDX_ROOT_URL

2013-12-04 12:59:35 -05:00

notes

annotation tools

2014-01-27 13:47:58 -05:00

notification_prefs

Notifier re-subcribe via link

2014-01-22 09:54:27 -08:00

open_ended_grading

Internationalization fixed for error msg on staff grading page.

2014-03-17 12:38:20 +05:00

psychometrics

Update logging.getLogger() calls to use edx instead of mitx

2013-12-04 15:18:15 -05:00

shoppingcart

Fix unicode issue in shopping cart

2014-03-06 11:46:53 +01:00

static_template_view