alawibaba 5107d463c7 Merge branch 'master' into release ...

Conflicts:
	lms/envs/common.py (RESOLVED)

2015-03-12 13:20:45 -04:00

..

cache_toolbox

…

config_models

Add donation end-point

2014-10-07 14:22:55 -04:00

contentserver

Added library import and export via .tar.gz'd XML files.

2015-03-10 21:29:29 +00:00

cors_csrf

Cross-domain CSRF cookies

2015-03-11 14:28:19 -04:00

course_about

Better support specifying of modulestore configuration in test cases

2015-02-04 09:09:14 -05:00

course_action_state

avoid database error when recording task exception

2015-01-29 11:25:45 -05:00

course_modes

ECOM-1155 fix the date diff issue.

2015-03-12 16:24:51 +05:00

dark_lang

s/pylint: disable=W0621/pylint: disable=redefined-outer-name/

2014-12-01 11:22:08 -05:00

datadog

…

django_comment_common

Address pylint issue from diff-cover

2014-12-11 13:09:23 -05:00

django_future

…

edxmako

Teach edx-mako to force csrf_tokens to unicode (from smart_strings)

2015-02-27 13:38:16 -05:00

embargo

Reorganized course_structures app

2015-03-10 11:12:51 -04:00

enrollment

Cross-domain CSRF cookies

2015-03-11 14:28:19 -04:00

external_auth

Better support specifying of modulestore configuration in test cases

2015-02-04 09:09:14 -05:00

geoinfo

Better support specifying of modulestore configuration in test cases

2015-02-04 09:09:14 -05:00

heartbeat

Remove "nopep" pragma

2015-02-27 11:49:51 -08:00

lang_pref

Add base support for cohorted group configurations

2014-12-05 09:52:26 -05:00

microsite_configuration

Make SessionMiddleware Microsite aware

2014-12-29 12:06:24 -05:00

monitoring

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

monkey_patch

…

oauth_exchange

Add an endpoint to exchange OAuth access tokens

2015-03-09 14:12:18 -04:00

pipeline_js

Remove "nopep" pragma

2015-02-27 11:49:51 -08:00

pipeline_mako

Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"

2015-01-28 17:26:46 -05:00

request_cache

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

reverification

Better support specifying of modulestore configuration in test cases

2015-02-04 09:09:14 -05:00

service_status

…

session_inactivity_timeout

…

static_replace

Make static URLs absolute in handouts, updates, and about for mobile API

2014-12-03 16:25:48 -05:00

status

cache site status message for 5 minutes (TNL-1614)

2015-03-11 14:28:19 -04:00

student

Switch to api directory and improve error handling.

2015-03-09 12:51:43 -04:00

terrain

Enforce the use of XModuleFactory only in contexts where something will clean up after it

2015-02-04 09:09:14 -05:00

third_party_auth

Combine account and profile into same API.

2015-03-05 16:13:49 -05:00

track

MA-272 Updated analytics shim for mobile video events

2015-03-09 15:01:30 -04:00

util

Entrance Exam authoring and messaging updates

2015-03-10 09:24:43 -04:00

xblock_django

Refactoring tests.

2015-01-29 13:33:28 +05:00

xmodule_django

Add empty introspection rule fro BlockTypeKeyField.

2015-03-05 22:34:29 -06:00

xmodule_modifiers.py

MA-212 Mobile API support for backward compatibility of course updates.

2015-01-08 10:05:29 -05:00