David Ormsbee 0d07ebc921 Merge branch 'master' into move_settings ...

Conflicts:
	static/simplewiki

2012-04-09 16:47:45 -04:00

djangoapps

Merge branch 'master' into move_settings

2012-04-09 16:47:45 -04:00

envs

remove unnecessary comments

2012-04-09 16:39:04 -04:00

fixtures

update pm fixture to reflect model move

2012-02-02 11:14:34 -05:00

lib

Moved site, is_secure, etc. into render_to_string shortcut, and fixed bugs in the shortcut. We should test this pretty well, since this touches a lot of templates

2012-03-28 19:44:22 -04:00

static

Merge branch 'master' into move_settings

2012-04-09 16:47:45 -04:00

templates

Reverted speed dropdown

2012-04-09 11:52:11 -04:00

__init__.py

Initial commit

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

.gitignore

type converted to isinstance

2012-03-28 17:11:14 -04:00

.hgignore

merge away detritus from static's default

2012-03-08 13:30:02 -05:00

LICENSE.TXT

Added an interrim license. We can always liberalize later

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

manage.py

manage.py has execute permissions

2012-01-17 13:39:49 -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

rakefile

Use the base package name as the provided value, rather than the path, because .deb packages can't start with /

2012-04-05 14:03:27 -04:00

requirements.txt

add django toolbar to depenedencies

2012-04-09 12:22:03 -04:00

settings.py

commenting out the use of S3 for static JS assets

2012-04-09 12:23:48 -04:00

urls.py

Merge branch 'master' into move_settings

2012-04-02 14:26:05 -04:00

Description

No description provided

AGPL-3.0 2.2 GiB

Languages

Python 73.7%

JavaScript 15.4%

HTML 7.1%

SCSS 3.2%

CSS 0.5%