edx-platform

Go to file

Calen Pennington 1831ab4ea5 Merge remote-tracking branch 'origin/master' into asset-pipeline

Conflicts:
	envs/dev.py
	sass/README
	static/css
	static/css/application.css
	static/css/marketing-ie.css
	static/css/marketing.css

2012-05-17 16:48:17 -04:00

djangoapps

Move accept header computations out of middleware

2012-05-17 13:23:20 -04:00

envs

Merge remote-tracking branch 'origin/master' into asset-pipeline

2012-05-17 16:48:17 -04:00

fixtures

Anonymize date stamps in problem solutions

2012-05-08 10:19:23 -04:00

lib

Merge remote-tracking branch 'origin/master' into asset-pipeline

2012-05-17 16:48:17 -04:00

sass

Merge remote-tracking branch 'origin/master' into asset-pipeline

2012-05-17 16:48:17 -04:00

static

Merge branch 'master' into asset-pipeline

2012-05-17 16:32:39 -04:00

templates

Merge remote-tracking branch 'origin/master' into asset-pipeline

2012-05-17 16:48:17 -04:00

test_root

Make tests work by default, without having to create any extra directories

2012-05-17 11:02:54 -04:00

__init__.py

Initial commit

2011-12-07 09:28:16 -05:00

.gitignore

Ike's changes to enable multicourse, new response types, etc.

2012-05-16 21:18:47 -04:00

.hgignore

merge away detritus from static's default

2012-03-08 13:30:02 -05:00

Gemfile

Add Guard to aid sass/coffeescript compilation

2012-05-17 15:41:43 -04:00

Gemfile.lock

Add Guard to aid sass/coffeescript compilation

2012-05-17 15:41:43 -04:00

Guardfile

Add Guard to aid sass/coffeescript compilation

2012-05-17 15:41:43 -04:00

LICENSE.TXT

Added an interrim license. We can always liberalize later

2011-12-18 11:19:35 -05:00

manage.py

manage.py has execute permissions

2012-01-17 13:39:49 -05:00

pre-requirements.txt

Adding pip requirement files. Pre-requirements must be run first, because scipy needs numpy already installed when executing the scipy installer

2012-03-22 12:37:07 -04:00

rakefile

Merge branch 'master' into asset-pipeline

2012-05-17 16:32:39 -04:00

requirements.txt

Merge remote-tracking branch 'origin/master' into asset-pipeline

2012-05-17 16:48:17 -04:00

settings.py

Merge branch 'master' into specific-error-handling

2012-05-17 11:39:21 -04:00

test-requirements.txt

Add pylint and pep8 to test deps

2012-05-15 14:53:23 -04:00

urls.py

Merge branch 'master' into asset-pipeline

2012-05-17 16:32:39 -04:00

Languages

Python 73.7%

JavaScript 15.4%

HTML 7.1%

SCSS 3.2%

CSS 0.5%