Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								67bca7473b
								
							
						 | 
						
							
							
								
								add default templates
							
							
							
							
							
						 | 
						
							2012-08-14 03:49:57 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								1f59ffa489
								
							
						 | 
						
							
							
								
								update project layout
							
							
							
							
							
						 | 
						
							2012-07-11 18:51:09 -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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								44fb5325f1
								
							
						 | 
						
							
							
								
								fixed account links on homepage
							
							
							
							
							
						 | 
						
							2012-05-29 15:34:14 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								6160ede722
								
							
						 | 
						
							
							
								
								removed homepage use of ifsetting_tag
							
							
							
							
							
						 | 
						
							2012-05-29 15:17:08 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								303877add6
								
							
						 | 
						
							
							
								
								updated templates
							
							
							
							
							
						 | 
						
							2012-05-29 15:12:22 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								09aa60777f
								
							
						 | 
						
							
							
								
								updated project layout for 1.4 (without content changes)
							
							
							
							
							
						 | 
						
							2012-05-29 14:53:04 -04:00 | 
						
						
							
							
							
								
							
							
						 |