Kyle Fiedler 162fa59441 Merge branch 'master' into pmitros/name-change ...

Conflicts:
	static/css/application.css
	static/css/marketing.css

2012-03-29 11:08:41 -04:00

djangoapps

Merge branch 'master' into pmitros/name-change

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

settings2

Force askbot config to draw all config values from askbotsettings.py, and not hit the database

2012-02-21 14:43:05 -05:00

static

Merge branch 'master' into pmitros/name-change

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

.DS_Store

Added more style for main navigation

2012-02-16 09:55:51 -05:00

.gitignore

type converted to isinstance

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

.hgignore

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04: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

Fix issue with publish step not finding the .deb file

2012-03-28 13:52:44 -04:00

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

settings.py

disabled mail_admins handler for error messages

2012-03-29 09:29:47 -04:00

urls.py

Incorporated Dave's feedback

2012-03-21 14:19:36 -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%