Commit graph

10 commits

Author SHA1 Message Date
Luke Hatcher
c05ec5da46 bump site tree version 2012-07-13 03:01:47 -04:00
James Tauber
19d8b1dc7e added initial docs on speakers app and updated sphinx 2012-07-12 15:53:04 -04:00
Luke Hatcher
1243e2a8ab add django-model-utils to project base 2012-07-12 01:06:25 -04:00
Luke Hatcher
bc4ae3b099 update theme and dua 2012-07-10 18:19:42 -04:00
Luke Hatcher
2665fd5758 update cms/boxes to pycon parity 2012-07-10 18:18:48 -04:00
Luke Hatcher
1b04b7a9f7 update debug toolbar 2012-07-10 18:14:49 -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
1191608a8a use django-forms-bootstrap 2012-05-29 21:50:46 -04:00
James Tauber
e96fe0bd5e updated requirements to 1.4 / DUA and latest versions 2012-05-29 15:00:14 -04:00
James Tauber
09aa60777f updated project layout for 1.4 (without content changes) 2012-05-29 14:53:04 -04:00