| 
								
								
									 Luke Hatcher | 4c194ed94c | add community pages | 2012-12-20 01:48:19 -05:00 |  | 
				
					
						| 
								
								
									 James Tauber | 89fb12f72f | implemented general file upload | 2012-10-18 02:43:00 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 6cf7a62da1 | track revisions for proposals, boxes and add reversion admin to all | 2012-07-18 19:19:59 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 2665fd5758 | update cms/boxes to pycon parity | 2012-07-10 18:18:48 -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 |  |