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

Andal.LND/edx-platform

Go to file

Chris Dodge 3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2

Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt

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

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -05:00

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

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

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

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

documenation for chem.miller

2012-11-22 18:43:41 +02:00

Anonymize date stamps in problem solutions

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

Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -05:00

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

2013-01-07 12:34:48 -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

.pylintrc

Ignore some spurious errors from pylint

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

apt-packages.txt

Move APT dependencies and repos to their own files

2012-11-28 19:13:31 -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

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

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 branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -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

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -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

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%