Luke Hatcher
|
b06daba446
|
Merge branch 'master' into cms-features
* master:
added BSD license
Update master
use django-forms-bootstrap
fixed account links on homepage
fixed staticfiles settings
removed homepage use of ifsetting_tag
updated urls
updated templates
updated imports to reflect new layout
updated imports to reflect new layout
updated settings
updated manage.py
updated requirements to 1.4 / DUA and latest versions
updated project layout for 1.4 (without content changes)
Conflicts:
requirements/base.txt
symposion/settings.py
symposion_project/urls.py
|
2012-07-10 15:35:30 -04:00 |
|
James Tauber
|
1191608a8a
|
use django-forms-bootstrap
|
2012-05-29 21:50:46 -04:00 |
|
James Tauber
|
44fb5325f1
|
fixed account links on homepage
|
2012-05-29 15:34:14 -04:00 |
|
James Tauber
|
9477c92abf
|
fixed staticfiles settings
|
2012-05-29 15:30:35 -04:00 |
|
James Tauber
|
6160ede722
|
removed homepage use of ifsetting_tag
|
2012-05-29 15:17:08 -04:00 |
|
James Tauber
|
02319e51c8
|
updated urls
|
2012-05-29 15:16:41 -04:00 |
|
James Tauber
|
303877add6
|
updated templates
|
2012-05-29 15:12:22 -04:00 |
|
James Tauber
|
4b87c51251
|
updated imports to reflect new layout
|
2012-05-29 15:12:03 -04:00 |
|
James Tauber
|
c9e600e42c
|
updated imports to reflect new layout
|
2012-05-29 15:08:05 -04:00 |
|
James Tauber
|
fc69aa85e8
|
updated settings
|
2012-05-29 15:06:24 -04:00 |
|
James Tauber
|
09aa60777f
|
updated project layout for 1.4 (without content changes)
|
2012-05-29 14:53:04 -04:00 |
|