Andal.LND/edx-platform - edx-platform - Andal Software Git

Andal.LND/edx-platform

Go to file

Don Mitchell 0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into

feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py

2012-12-11 10:55:10 -05:00

Merge remote-tracking branch 'origin/feature/cale/cms-master' into

2012-12-11 10:55:10 -05:00

Merge remote-tracking branch 'origin/feature/cale/cms-master' into

2012-12-11 10:55:10 -05:00

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-16 09:03:15 -05:00

claning

2012-11-06 14:41:15 +02:00

Anonymize date stamps in problem solutions

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

Namespace the coverage html and xml report generation tasks

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

Merge remote-tracking branch 'origin/feature/cale/cms-master' into

2012-12-11 10:55:10 -05:00

Add proxy rule for wiki for local testing of split servers

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

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

Merge branch 'master' into feature/victor/actual-askbot-removal

2012-11-15 14:24:55 -05:00

.gitmodules

Revert "remove (almost) all references to askbot."

2012-11-09 18:18:37 -05:00

.pylintrc

Ignore some spurious errors from pylint

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

brew-formulas.txt

Fixed install by adding mysql

2012-10-31 13:46:27 -04:00

create-dev-env.sh

Merge branch 'master' into feature/victor/actual-askbot-removal

2012-11-15 14:24:55 -05:00

Gemfile

Make rake commands to run jasmine tests in browser and via phantomjs

2012-10-30 10:41:02 -04:00

github-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

install.txt

Revert "remove (almost) all references to askbot."

2012-11-09 18:18:37 -05:00

LICENSE.TXT

Added an interrim license. We can always liberalize later

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

local-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

pre-requirements.txt

Fixed dependency problem introduced by MySQL-python by forcing distribute version >= 0.6.28 in pre-requirements

2012-11-01 14:08:24 +00:00

prod-requirements.txt

remove extra newline

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

rakefile

Merge pull request #1048 from MITx/feature/cdodge/xlint

2012-11-26 08:11:34 -08: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

added factory_boy to requirements.txt

2012-11-26 13:36:35 -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

setup-test-dirs.sh

Address comments on #484 .

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

test-requirements.txt

Enable XModule factories to work with the currently version of Factory Boy at PyPI (1.2.0) so that the code will work with 'pip install factory_boy'

2012-11-15 11:40:29 -05:00

README

See doc/ for documentation.

Languages

Python 73.7%

JavaScript 15.4%

HTML 7.1%

SCSS 3.2%

CSS 0.5%