edx-platform

Go to file

Diana Huang 51db547a63 Merge branch 'master' into diana/rubric-ui-improvements

Conflicts:
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee

2013-02-05 16:18:56 -05:00

cms

Merge pull request #1397 from MITx/feature/cale/no-course-collectstatic

2013-02-05 10:32:54 -08:00

common

Merge branch 'master' into diana/rubric-ui-improvements

2013-02-05 16:18:56 -05:00

doc

add docs for conditional module; clean up a bit more

2013-02-03 21:07:23 -05:00

docs

Updated DOCS with sample XML for DnD.

2013-01-21 15:56:39 +02:00

fixtures

…

jenkins

Do not run the lms jasmine tests on jenkins for now, until we fix them.

2013-01-23 16:03:25 -05:00

lms

Merge branch 'master' into diana/rubric-ui-improvements

2013-02-05 16:18:56 -05:00

proxy

…

test_root

…

__init__.py

…

.gitignore

…

.gitmodules

…

.pylintrc

…

.ruby-version

Change ruby version

2013-01-29 21:53:36 -05:00

apt-packages.txt

…

apt-repos.txt

…

brew-formulas.txt

…

create-dev-env.sh

…

Gemfile

Remove the specific version of ruby here because it's breaking the dev scripts amongst other things.

2013-01-28 12:51:05 -05:00

github-requirements.txt

Not sure why this was set to use SSH.

2013-01-24 10:06:09 -05:00

install-system-req.sh

…

install.txt

…

LICENSE.TXT

…

local-requirements.txt

…

pre-requirements.txt

…

prod-requirements.txt

…

rakefile

Changed back rakefile.

2013-01-21 15:54:56 +02:00

README

…

repo-requirements.txt

…

requirements.txt

Fix pillow requirement

2013-01-30 16:00:55 -05:00

run_watch_data.py

…

run.sh

…

setup-test-dirs.sh

…

test-requirements.txt

…

README

See doc/ for documentation.

Languages

Python 73.7%

JavaScript 15.4%

HTML 7.1%

SCSS 3.2%

CSS 0.5%