edx-platform

Go to file

Calen Pennington 8575ed439d Merge branch 'master' into dogfood

Conflicts:
	djangoapps/courseware/capa/responsetypes.py
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/html_module.py
	djangoapps/courseware/modules/seq_module.py
	djangoapps/courseware/modules/x_module.py
	djangoapps/courseware/views.py
	templates/main.html
	templates/problem.js
	templates/textbox.html

2012-06-05 14:38:49 -04:00

djangoapps

Merge branch 'master' into dogfood

2012-06-05 14:38:49 -04:00

envs

Merge branch 'master' into dogfood

2012-06-05 14:38:49 -04:00

fixtures

Anonymize date stamps in problem solutions

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

lib

move quickedit* from courseware.views to dogfood.views ; now dogfood

2012-06-04 17:19:05 -04:00

static

Merge branch 'master' into dogfood

2012-06-05 14:38:49 -04:00

templates

Merge branch 'master' into dogfood

2012-06-05 14:38:49 -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

Update requirement dependencies

2012-05-30 14:22:36 -04:00

.hgignore

merge away detritus from static's default

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

brew-formulas.txt

removing mercurial from brew install list

2012-05-31 14:36:23 -04:00

collect_static_resources

Use the correct command to get the directory name when running collectstatic

2012-05-24 11:34:12 -04:00

create-dev-env.sh

updating for coffeescript

2012-05-31 14:54:38 -04:00

Gemfile

Update requirement dependencies

2012-05-30 14:22:36 -04:00

Gemfile.lock

Update requirement dependencies

2012-05-30 14:22:36 -04:00

install.txt

updating for coffeescript

2012-05-31 14:54:38 -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

Don't fail post-install configuration if gunicorn won't stop

2012-05-31 11:59:14 -04:00

README

README for dynamath

2012-06-02 19:01:33 -04:00

requirements.txt

Merge branch 'master' into dogfood

2012-06-05 14:38:49 -04:00

run.sh

Fixed run script

2012-06-01 16:02:23 -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 dogfood

2012-06-05 14:38:49 -04:00

README

This branch (re-)adds dynamic math and symbolicresponse.
Test cases included.

Languages

Python 73.7%

JavaScript 15.4%

HTML 7.1%

SCSS 3.2%

CSS 0.5%