Renzo Lucioni 5bb0e90878 Merge pull request #12156 from edx/renzo/merge-release-into-master ...

Manually merge release into master

2016-04-15 00:47:54 -04:00

..

cms

Delete dead SUBDOMAIN_BRANDING setting.

2015-12-15 14:42:09 -05:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

acceptance.py

Implement a BaseStudentModuleHistory

2016-02-29 13:59:27 -05:00

aws_migrate.py

Don't hardcode student_module_history

2016-03-01 11:56:11 -05:00

aws.py

Manually merge release into master

2016-04-14 14:23:06 -04:00

bok_choy.auth.json

Create a new CSMHExtended table to hold our new data

2016-02-29 13:58:39 -05:00

bok_choy.env.json

Fixed unable to created ccx even if ccx_conn url is not set

2016-04-07 19:30:17 +05:00

bok_choy.py

Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"

2016-04-12 08:22:14 -04:00

common.py

Merge pull request #12156 from edx/renzo/merge-release-into-master

2016-04-15 00:47:54 -04:00

content.py

Upgrade django-debug-toolbar to 1.2.2

2015-02-26 15:57:03 -05:00

dev_with_worker.py

Rebase upgrade Django to v1.8.5

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

dev.py

Delete crowdsource_hinter prototype xmodule.

2016-03-04 15:34:48 -05:00

devplus.py

Create a new CSMHExtended table to hold our new data

2016-02-29 13:58:39 -05:00

devstack_optimized.py

Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"

2016-04-12 08:22:14 -04:00

devstack.py

Revert "Remove ThemingAware storage mixins and ComprehensiveThemeFinder."

2016-04-12 16:22:34 -04:00

discussionsettings.py

Remove useless pylint suppressions

2015-11-22 07:41:19 -05:00

load_test.py

Rebase upgrade Django to v1.8.5

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

sauce.py

Remove useless pylint suppressions

2015-11-22 07:41:19 -05:00

static.py

Create a new CSMHExtended table to hold our new data

2016-02-29 13:58:39 -05:00

test_static_optimized.py

Create a new CSMHExtended table to hold our new data

2016-02-29 13:58:39 -05:00

test_with_mysql.py

Cleanup some settings.

2015-11-20 18:18:32 +05:00

test.py

Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"

2016-04-12 08:22:14 -04:00

yaml_config.py

Use yaml.safe_load, since we have no need for the greater power of .load

2016-02-24 15:36:04 -05:00