Han Su Kim bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved ...

Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt

2014-03-06 16:56:16 -05:00

..

cache_toolbox

Unicode changes to support QRF

2014-01-30 16:20:36 -05:00

config_models

Switch dark_lang to database backed configuration

2014-01-29 13:24:41 -05:00

contentserver

Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation""

2013-10-18 09:22:30 -04:00

course_groups

Unicode changes to support QRF

2014-01-30 16:20:36 -05:00

course_modes

Response to CR 1-14

2014-01-15 00:27:14 +00:00

dark_lang

wiring for language selector

2014-02-14 10:32:10 -05:00

datadog

Remove dogstatsd-python in favor of dogapi

2013-09-11 19:28:58 -04:00

django_comment_common

assign default forum role 'Student' to user on course recreate with same name STUD-1140

2014-02-26 15:40:44 +05:00

django_future

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

edxmako

This PR addresses the open feedback on the Microsites feature

2014-02-28 16:27:12 -05:00

embargo

Add logging to embargo middleware

2014-03-02 18:27:18 -05:00

external_auth

add new feature to make sure we aren't writing PII into the application logs. So far we're aware of doing so regarding Auth use-cases

2014-02-25 00:14:19 -05:00

heartbeat

convert all datetime.now() to datetime.now(UTC)

2013-07-22 17:39:11 -04:00

lang_pref

Update cms urls for language preferences

2014-02-14 22:35:14 +00:00

microsite_configuration

This PR addresses the open feedback on the Microsites feature

2014-02-28 16:27:12 -05:00

monitoring

Move libraries that can only be imported in the context of django into common/djangoapps

2012-06-18 13:48:26 -04:00

pipeline_js

mitxmako => edxmako

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

pipeline_mako

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

request_cache

use a request-scoped cache to keep the metadata inheritence tree around for the whole request. This means we should only do one trip to Memcached/Mongo per course per request. This is expected to keep memory utilization down

2013-03-27 22:37:07 -04:00

reverification

Midcourse reverifications: dismissal banner

2014-01-31 22:20:32 +00:00

service_status

Use assertIsInstance.

2013-10-07 18:17:40 -04:00

session_inactivity_timeout

add middleware to be able to expire inactive sessions after N seconds

2014-01-24 10:36:21 -05:00

static_replace

Unicode changes to support QRF

2014-01-30 16:20:36 -05:00

status

Remove unused imports from common, as reported by pylint.

2013-06-19 16:56:34 -04:00

student

Add translator comments for 'other' and 'none' strings

2014-03-04 16:40:27 +01:00

terrain

Add acceptance tests for forums comment deletion.

2014-02-26 10:31:02 -05:00

track

Tests for embargo middleware feature

2014-02-27 09:33:17 -05:00

user_api

Add tests and clean up A/B testing

2014-03-05 13:46:03 -05:00

util

This PR addresses the open feedback on the Microsites feature

2014-02-28 16:27:12 -05:00

xmodule_modifiers.py

Make staff view work w/ pure xblocks (that only have a descriptor system)

2014-02-21 16:47:19 -05:00