Cliff Dyer 6917eb03cf Merge pull request #12009 from edx/merge-release-into-master ...

Merge oauth release into master via intermediary branch

2016-04-01 06:12:16 -04:00

..

__init__.py

Get the cms up to the point of rendering a template

2012-06-08 14:01:41 -04:00

acceptance.py

Create a new CSMHExtended table to hold our new data

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

aws_migrate.py

Don't hardcode student_module_history

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

aws.py

Merge pull request #11641 from eduNEXT/fmo/read_elasticsearch_config_from_json

2016-03-31 14:27:22 -04:00

bok_choy.auth.json

Update reset-test-db.sh for bok-choy

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

bok_choy.env.json

Custom icons for third party auth login buttons

2016-04-01 08:57:43 +07:00

bok_choy.py

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

2016-03-28 14:57:01 -04:00

common.py

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2016-03-31 20:15:22 +00:00

debug_upload.py

s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/

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

dev_dbperf.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

Remove ruby reference in pipeline arguments.

2016-02-08 18:18:37 -05:00

devstack_optimized.py

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

2016-03-28 14:57:01 -04:00

devstack.py

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

2016-03-28 14:57:01 -04:00

microsite_test.py

s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/

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

test_static_optimized.py

Rebase upgrade Django to v1.8.5

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

test.py

Merge pull request #11885 from edx/saleem-latif/WL-328

2016-03-28 16:23:34 -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