edx-platform

Files

muhammad-ammar 8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge

Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt

2015-11-18 17:53:44 +05:00

djangoapps

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

2015-11-18 17:53:44 +05:00

envs

Make sure Studio has a secret key

2015-11-13 12:30:54 -05:00

lib

Groundwork for Studio extensibility

2015-10-20 14:57:33 -04:00

static

Correct the remove icon.

2015-11-16 12:29:42 -05:00

templates

Rebase upgrade Django to v1.8.5

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

tests

Add themes files to staticfiles_dir in Studio

2015-01-17 13:24:54 +01:00

__init__.py

Fix pep8 and pylint.

2015-05-08 09:01:50 -04:00

celery.py

Fix pep8 and pylint.

2015-05-08 09:01:50 -04:00

README.rst

added READMEs for top level directories

2015-03-31 16:47:37 +02:00

startup.py

Rebase upgrade Django to v1.8.5

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

urls_dev.py

…

urls.py

Revert "Public Course Import/Export API (continued)"

2015-10-23 20:02:34 -04:00

wsgi.py

Add the ability to send SIGPROF to an edx-platform process to obtain a memory dump

2015-02-02 13:12:58 -05:00

README.rst

CMS (Content Management System)
-------------------------------

This directory contains code relating to the course management portal for edX, also known as Studio.