David Ormsbee 98ff3d5bfb Merge branch 'master' into move_settings ...

Conflicts:
	djangoapps/student/views.py
	urls.py

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

djangoapps

Merge branch 'master' into move_settings

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

envs

Flesh out the README.txt for the new settings arrangement

2012-04-02 14:20:00 -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-02 14:26:05 -04:00

templates

Merge branch 'master' into pmitros/name-change

2012-03-29 11:08:41 -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

Don't fail post-install script if link target doesn't exist

2012-03-29 11:40:03 -04:00

requirements.txt

Django version restriction

2012-03-30 09:16:11 -04:00

settings.py

Settings has a default sqlite database

2012-03-30 18:22:44 -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%