Luke Hatcher
|
907f0a5fd4
|
add sidebar block
|
2012-07-12 23:38:48 -04:00 |
|
Luke Hatcher
|
732c8db23e
|
use symposion sidebar base
|
2012-07-12 23:38:48 -04:00 |
|
Luke Hatcher
|
7c838a526a
|
add sidebar base
|
2012-07-12 23:38:48 -04:00 |
|
Luke Hatcher
|
625f5b1024
|
update front page
|
2012-07-12 23:38:48 -04:00 |
|
Luke Hatcher
|
dc9f313fe6
|
add in less
|
2012-07-12 23:38:48 -04:00 |
|
Luke Hatcher
|
3659da80b9
|
initial dashboard for symposion
|
2012-07-12 16:08:40 -04:00 |
|
Luke Hatcher
|
fcdad2c53b
|
fix speaker templates to use proper base template
|
2012-07-12 16:08:40 -04:00 |
|
Luke Hatcher
|
32c8c0ce50
|
end with a newline
|
2012-07-12 01:59:28 -04:00 |
|
Luke Hatcher
|
21ad87024d
|
add dashboard template
|
2012-07-12 01:32:16 -04:00 |
|
Luke Hatcher
|
3ca56663a4
|
proposals templates
|
2012-07-12 01:31:51 -04:00 |
|
Luke Hatcher
|
0426d8d877
|
speaker templates
|
2012-07-12 01:31:41 -04:00 |
|
Luke Hatcher
|
1f59ffa489
|
update project layout
|
2012-07-11 18:51:09 -04:00 |
|
Luke Hatcher
|
3bed4f03c1
|
remove old project dir that seemed to come back with the merge commit
|
2012-07-11 18:40:02 -04:00 |
|
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
|
09aa60777f
|
updated project layout for 1.4 (without content changes)
|
2012-05-29 14:53:04 -04:00 |
|
Luke Hatcher
|
87f14b8015
|
adding in basic nav
|
2012-05-22 02:11:40 -04:00 |
|
Luke Hatcher
|
1ba6f03529
|
add side nav with sibling pages
|
2012-05-22 00:38:12 -04:00 |
|
Luke Hatcher
|
23503525a6
|
rename block
|
2012-05-22 00:37:53 -04:00 |
|
Luke Hatcher
|
ae6fd7947e
|
remove mptt driven menu
|
2012-05-22 00:37:06 -04:00 |
|
Luke Hatcher
|
637921628e
|
Merge branch 'fresh-start' into cms-features
* fresh-start:
update theme
fixed coding convention nits
internationalized the sponsor model fields
Makes conference app fields and models localizable
added documentation for conference models
made sponsorship app conference-aware
initial documentation of sponsorship app
added sponsorship template tags and template fragments; improved admin
fixed incorrect module name in import
initial sponsorship app adapted from DjangoCon
Conflicts:
symposion_project/requirements/base.txt
symposion_project/settings.py
|
2012-05-21 20:10:32 -04:00 |
|
Luke Hatcher
|
4ca2118bca
|
adding menu context processor and hooking up template
|
2012-02-05 22:01:56 -05:00 |
|
Luke Hatcher
|
d0be075c89
|
adding prototype cms app with pages and menu
|
2012-02-05 20:34:49 -05:00 |
|
James Tauber
|
e4e7b890a2
|
added sponsorship template tags and template fragments; improved admin
|
2012-02-05 17:13:06 -05:00 |
|
James Tauber
|
0f6843b08d
|
pinax account project
|
2012-02-05 13:53:49 -05:00 |
|