edx-platform

Go to file

David Ormsbee aeee2791ea Merge remote-tracking branch 'rocky/master' into feature/dave/forum_fixes

Conflicts:
	lms/lib/comment_client/utils.py
	lms/templates/discussion/mustache/_content.mustache

2012-08-22 20:00:06 -04:00

askbot @ e56ae38084

Updated sumbodule to compatible version of askbot.

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

cms

Added fix for cms sass

2012-08-21 16:01:48 -04:00

common

Merge branch 'master' of github.com:MITx/mitx into merge

2012-08-22 14:11:44 -07:00

doc

Merge branch 'master' into profile

2012-08-18 17:04:37 -07:00

fixtures

Anonymize date stamps in problem solutions

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

lms

Merge remote-tracking branch 'rocky/master' into feature/dave/forum_fixes

2012-08-22 20:00:06 -04:00

proxy

Add proxy rule for wiki for local testing of split servers

2012-08-17 14:05:38 -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

__init__.py

Initial commit

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

.gitignore

add test output files to gitignore

2012-08-21 15:02:26 -04:00

.gitmodules

Moved django-wiki submodule to be a pip install from git.

2012-08-16 10:54:34 -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

updating dependencies for pystache, networkx, graphviz and removing redundant dependency for django-staticfiles

2012-08-20 16:35:42 -04:00

create-dev-env.sh

updating dependencies for pystache, networkx, graphviz and removing redundant dependency for django-staticfiles

2012-08-20 16:35:42 -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

Meaningless commit to force build

2012-08-20 20:15:07 -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

Add more excludes to rakefile

2012-08-22 15:14:25 -04:00

README

Dummy commit to force rebuild

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

repo-requirements.txt

We use django-wiki's built-in wikilinks markdown extension. They were clashing.

2012-08-22 15:57:44 -04:00

requirements.txt

fixed requirements

2012-08-22 11:07:12 -07: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

setup-test-dirs.sh

Address comments on #484 .

2012-08-21 17:01:25 -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%