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 | 
						
						
							
							
							
								
							
							
						 |