Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
symposion_app/symposion_project
History
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
..
apps Merge branch 'fresh-start' into cms-features 2012-05-21 20:10:32 -04:00
docs Merge branch 'fresh-start' into sponsorship 2012-02-05 23:07:02 -05:00
fixtures pinax account project 2012-02-05 13:53:49 -05:00
requirements Merge branch 'fresh-start' into cms-features 2012-05-21 20:10:32 -04:00
static pinax account project 2012-02-05 13:53:49 -05:00
templates Merge branch 'fresh-start' into cms-features 2012-05-21 20:10:32 -04:00
__init__.py pinax account project 2012-02-05 13:53:49 -05:00
manage.py pinax account project 2012-02-05 13:53:49 -05:00
settings.py Merge branch 'fresh-start' into cms-features 2012-05-21 20:10:32 -04:00
urls.py adding prototype cms app with pages and menu 2012-02-05 20:34:49 -05:00
wsgi.py pinax account project 2012-02-05 13:53:49 -05:00