edx-platform

Go to file

Calen Pennington 801df37872 Merge remote-tracking branch 'origin/master' into arjun/javascript_response

Conflicts:
	common/lib/xmodule/xmodule/js/src/capa/display.coffee
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/module_render.py

2012-08-13 10:13:21 -04:00

askbot @ e56ae38084

Updated sumbodule to compatible version of askbot.

2012-08-08 15:37:54 -04:00

cms

Merge pull request #396 from MITx/feature/ichuang/xqa-and-patches

2012-08-13 06:55:05 -07:00

common

Merge remote-tracking branch 'origin/master' into arjun/javascript_response

2012-08-13 10:13:21 -04:00

doc

add notes on how to run individual tests

2012-08-12 16:59:07 -04:00

fixtures

Anonymize date stamps in problem solutions

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

lms

Merge remote-tracking branch 'origin/master' into arjun/javascript_response

2012-08-13 10:13:21 -04:00

proxy

Add nginx.conf file for running a multi-server dev env

2012-08-12 23:35:50 -04:00

test_root

Add tests for the edit page for the toy course, and make sure that exporting to github sets up the git repo properly

2012-07-24 15:05:07 -04:00

utility-scripts

update utility script to create course groups

2012-08-10 15:25:42 -04:00

__init__.py

Initial commit

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

.gitignore

Added courseware css back into the main template

2012-07-25 14:57:44 -04:00

.gitmodules

Config for integration tests

2012-07-27 16:09:25 -04:00

.hgignore

merge away detritus from static's default

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

.pylintrc

Ignore some spurious errors from pylint

2012-07-26 10:48:55 -04:00

brew-formulas.txt

removing mercurial from brew install list

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

create-dev-env.sh

trailing whitespace

2012-08-01 11:08:41 -04:00

Gemfile

version is required http://gembundler.com/man/gemfile.5.html , this was causing rvm to return non-zero and thus causing the create-dev-env.sh script to fail

2012-07-31 14:58:07 -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

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

prod-requirements.txt

updating prod-requirements

2012-08-01 16:57:13 -04:00

rakefile

Remove comment in Rakefile I was just testing.

2012-08-10 17:07:03 -04:00

README

Dummy commit to force rebuild

2012-07-17 14:58:09 -04:00

repo-requirements.txt

rakefile updated so that python modules in the package will be installed at package install time

2012-07-11 09:23:20 -04:00

requirements.txt

Upgrading to django 1.4.

2012-08-08 11:57:15 -04:00

run_watch_data.py

Watching xmodule js

2012-08-06 18:08:07 -04:00

run.sh

Make run.sh just run the relevant rake lms command

2012-06-07 16:38:18 -04:00

test-requirements.txt

Add pylint and pep8 to test deps

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

README

See doc/ for documentation.

Languages

Python 73.7%

JavaScript 15.4%

HTML 7.1%

SCSS 3.2%

CSS 0.5%