edx-platform

Go to file

Calen Pennington 8a9ba79d1f Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py

2013-03-06 12:15:07 -05:00

cms

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-06 12:15:07 -05:00

common

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-06 12:15:07 -05:00

doc

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-06 12:15:07 -05:00

docs

Updated DOCS with sample XML for DnD.

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

fixtures

Anonymize date stamps in problem solutions

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

jenkins

Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model

2013-02-07 15:12:30 -05:00

lms

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-06 12:15:07 -05:00

proxy

Add proxy rule for wiki for local testing of split servers

2012-08-17 14:05:38 -04:00

test_root

Create the test_root/log directory on git checkout

2012-11-13 10:38:07 -05:00

__init__.py

Initial commit

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

.gitignore

change cohort dropdown verbiage

2013-02-08 15:41:11 -05:00

.gitmodules

put back in .gitmodules which got accidentally deleted

2013-01-07 12:43:18 -05:00

.pep8

Config changes to make pep8 autofixes easier

2013-02-06 11:10:54 -05:00

.pylintrc

Ignore some spurious errors from pylint

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

.ruby-version

Change ruby version

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

apt-packages.txt

Pillow needs libjpeg-dev to build JPG support.

2013-02-07 15:20:42 -05:00

apt-repos.txt

Move APT dependencies and repos to their own files

2012-11-28 19:13:31 -05:00

brew-formulas.txt

Add mongodb to create-dev-env.sh script

2012-11-28 19:13:11 -05:00

create-dev-env.sh

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

distribute-0.6.32.tar.gz

added cohorted mustache template for inline

2013-02-08 10:39:59 -05:00

distribute-0.6.34.tar.gz

added cohorted mustache template for inline

2013-02-08 10:39:59 -05:00

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

Get the latest version of XBlock automatically

2013-01-24 13:52:43 -05:00

install-system-req.sh

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

install.txt

remove (almost) all references to askbot.

2012-10-30 18:23:07 -04:00

LICENSE.TXT

Added an interrim license. We can always liberalize later

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

local-requirements.txt

Fix tests except for conditional module and open ended grading

2013-03-05 15:04:59 -05:00

pre-requirements.txt

locking django-nose and numpy versions

2013-03-01 12:08:20 -05:00

prod-requirements.txt

remove extra newline

2012-10-24 15:42:03 -04:00

rakefile

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-06 12:15:07 -05:00

README

Dummy commit to force rebuild

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

repo-requirements.txt

Split out requirements that come from the local mitx repo and those that come from github, and upgrade the local requirements before running tests

2012-11-08 11:20:16 -05:00

requirements.txt

locking django-nose and numpy versions

2013-03-01 12:08:20 -05:00

run_watch_data.py

Restart server when xmodule css changes (run_watch_data)

2012-09-27 02:23:42 -07:00

run.sh

Make run.sh just run the relevant rake lms command

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

runone.py

A script to run just one test, based on the test failure description.

2013-02-22 10:52:25 -05:00

setup-test-dirs.sh

Address comments on #484 .

2012-08-21 17:01:25 -04:00

setup.py

Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api

2013-01-04 16:19:58 -05:00

test-requirements.txt

Merge branch 'master' into feature/cdodge/cms-master-merge2

2013-01-07 12:34:48 -05:00

README

See doc/ for documentation.

Languages

Python 73.7%

JavaScript 15.4%

HTML 7.1%

SCSS 3.2%

CSS 0.5%