Christopher Lee 8a784eef24 Merge pull request #13949 from edx/release-2016-11-08-conflict ...

Release 2016 11 08 conflict

2016-11-08 15:32:16 -05:00

..

api_admin

Expose the user email to the api-admin view

2016-10-28 12:55:27 +05:00

auth_exchange

Move auth_exchange from common to openedx/core.

2016-10-06 12:54:39 -04:00

bookmarks

Merge pull request #13686 from edx/openedx_cleanup/misc

2016-10-07 13:33:51 -04:00

cache_toolbox

Move cache_toolbox from common to openedx/core.

2016-10-06 16:57:00 -04:00

catalog

Leverage the catalog's exclude_utm parameter

2016-09-29 18:17:58 -04:00

ccxcon

Simplify how shards are selected in CI

2016-08-03 16:23:02 -04:00

commerce

Pass Sailthru campaign id cookie to ecommerce

2016-09-08 10:50:13 -04:00

common_views

Fix unused-import errors

2016-08-03 12:44:41 -04:00

content

Revert "Merge pull request #13915 from edx/revert-13794-yro_implement-dateutil"

2016-11-07 17:04:13 -05:00

contentserver

Move header_control from common to openedx/core

2016-10-11 17:56:56 -04:00

cors_csrf

Move cors_crsf to openedx/core

2016-10-14 13:59:01 -04:00

course_groups

Fix issues with RequestFactory used as Request.

2016-11-07 10:51:04 -05:00

coursegraph

Merge branch 'release' into release-2016-11-08-conflict

2016-11-08 14:23:57 -05:00

coursetalk

Make migrations in-sync with models

2016-04-07 12:26:18 +05:00

credentials

Simplify how shards are selected in CI

2016-08-03 16:23:02 -04:00

credit

Support for rescoring a problem only if the new score is higher

2016-10-20 15:08:54 -04:00

dark_lang

Move dark_lang and lang_pref apps to openedx/core

2016-10-13 11:56:24 -04:00

datadog

Move datadog from common to openedx/core.

2016-10-07 08:57:02 -04:00

debug

FEDX-118 Adding header to test page

2016-04-25 10:56:28 -04:00

embargo

Move embargo from common to openedx/core/djangoapps.

2016-11-07 08:47:36 -05:00

external_auth

Moves external_auth from common to openedx/core.

2016-10-07 12:34:22 -04:00

geoinfo

Move geoinfo from common to openedx/core

2016-10-07 00:26:35 -04:00

header_control

Move header_control from common to openedx/core

2016-10-11 17:56:56 -04:00

heartbeat

Move heartbeat from common to openedx/core

2016-10-07 10:42:47 -04:00

lang_pref

Move dark_lang and lang_pref apps to openedx/core

2016-10-13 11:56:24 -04:00

models

Simplify how shards are selected in CI

2016-08-03 16:23:02 -04:00

monitoring

Move monitoring from common to openedx/core

2016-10-07 08:43:24 -04:00

monkey_patch

Move monkey_patch to openedx.core.djangoapps.

2016-10-06 10:16:14 -04:00

oauth_dispatch

add restricted DOT OAUTH2 client with reduced privileges

2016-10-14 07:31:26 -04:00

performance

Move performance.views to its own urls.py.

2016-10-12 14:37:18 -04:00

profile_images

fix None value for orientation update

2016-11-04 16:48:25 +05:00

programs

Retrieve marketable MicroMasters from the catalog service

2016-09-07 17:44:54 -04:00

safe_sessions

Fix issues with RequestFactory used as Request.

2016-11-07 10:51:04 -05:00

self_paced

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

service_status

Move service_status from common into openedx

2016-10-06 13:37:35 -04:00

session_inactivity_timeout

Move session_inactivity_timeout to openedx/core

2016-10-12 00:17:54 -04:00

signals

Hide credit button from audit track students

2016-08-11 23:20:01 +05:00

site_configuration

Add testing for 'saml' management command

2016-10-19 12:49:41 +05:00

theming

Merge pull request #13492 from edx/asadiqbal08/WL-603-edx

2016-09-22 16:28:19 +05:00

user_api

Fix issues with RequestFactory used as Request.

2016-11-07 10:51:04 -05:00

util

Add transformer that collects grading data.

2016-05-26 16:15:34 -04:00

xmodule_django

Move xmodule_django app to openedx.core.djangoapps

2016-10-06 14:50:40 -04:00

__init__.py

Add base support for cohorted group configurations

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