Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								11ac37efed 
								
							 
						 
						
							
							
								
								add user display  
							
							
							
						 
						
							2012-07-13 13:59:40 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									James Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								52dd22f0da 
								
							 
						 
						
							
							
								
								added admin for proposals  
							
							
							
						 
						
							2012-07-13 09:27:52 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									James Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								80d2c2d736 
								
							 
						 
						
							
							
								
								added proposal models, forms and base fixtures to project  
							
							
							
						 
						
							2012-07-13 09:21:27 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									James Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								9d367667f2 
								
							 
						 
						
							
							
								
								got sponsorship app flow working, adding missing templates, etc  
							
							
							
						 
						
							2012-07-13 08:59:25 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								b9fe28b4a9 
								
							 
						 
						
							
							
								
								add site tree fixture  
							
							
							
						 
						
							2012-07-13 03:20:56 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								587112999f 
								
							 
						 
						
							
							
								
								use a fake date  
							
							
							
						 
						
							2012-07-13 03:16:44 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								53a04262d4 
								
							 
						 
						
							
							
								
								update dashboard  
							
							
							
						 
						
							2012-07-13 03:11:22 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								9b0648ddfd 
								
							 
						 
						
							
							
								
								add admin link  
							
							
							
						 
						
							2012-07-13 03:07:54 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								03d5b55a4e 
								
							 
						 
						
							
							
								
								update initial fixture  
							
							
							
						 
						
							2012-07-13 03:07:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								bce0ced774 
								
							 
						 
						
							
							
								
								use site name in template  
							
							
							
						 
						
							2012-07-13 03:07:35 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								343699bc31 
								
							 
						 
						
							
							
								
								style edit boxes  
							
							
							
						 
						
							2012-07-13 03:07:13 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								c05ec5da46 
								
							 
						 
						
							
							
								
								bump site tree version  
							
							
							
						 
						
							2012-07-13 03:01:47 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								9ae82e45ef 
								
							 
						 
						
							
							
								
								bold labels  
							
							
							
						 
						
							2012-07-13 00:34:24 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								a5dc78cf71 
								
							 
						 
						
							
							
								
								comment out breadcrumbs for now  
							
							
							
						 
						
							2012-07-13 00:34:16 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								e126be16e3 
								
							 
						 
						
							
							
								
								switch speaker forms to vertical form  
							
							
							
						 
						
							2012-07-13 00:34:07 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								c8e0d667d5 
								
							 
						 
						
							
							
								
								update proposal templates to use site_base  
							
							
							
						 
						
							2012-07-13 00:33:50 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								8d979bf4af 
								
							 
						 
						
							
							
								
								add new header  
							
							
							
						 
						
							2012-07-12 23:38:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								907f0a5fd4 
								
							 
						 
						
							
							
								
								add sidebar block  
							
							
							
						 
						
							2012-07-12 23:38:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								732c8db23e 
								
							 
						 
						
							
							
								
								use symposion sidebar base  
							
							
							
						 
						
							2012-07-12 23:38:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								d4d7acabf4 
								
							 
						 
						
							
							
								
								clickable header  
							
							
							
						 
						
							2012-07-12 23:38:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								7c838a526a 
								
							 
						 
						
							
							
								
								add sidebar base  
							
							
							
						 
						
							2012-07-12 23:38:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								625f5b1024 
								
							 
						 
						
							
							
								
								update front page  
							
							
							
						 
						
							2012-07-12 23:38:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								dc9f313fe6 
								
							 
						 
						
							
							
								
								add in less  
							
							
							
						 
						
							2012-07-12 23:38:48 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									James Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								dc11411a4a 
								
							 
						 
						
							
							
								
								added first pass of documentation about proposals  
							
							
							
						 
						
							2012-07-12 16:38:42 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								3659da80b9 
								
							 
						 
						
							
							
								
								initial dashboard for symposion  
							
							
							
						 
						
							2012-07-12 16:08:40 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								fcdad2c53b 
								
							 
						 
						
							
							
								
								fix speaker templates to use proper base template  
							
							
							
						 
						
							2012-07-12 16:08:40 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									James Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								81853ece30 
								
							 
						 
						
							
							
								
								made biography optional and cleaned up speaker code a little  
							
							
							
						 
						
							2012-07-12 15:53:44 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									James Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								19d8b1dc7e 
								
							 
						 
						
							
							
								
								added initial docs on speakers app and updated sphinx  
							
							
							
						 
						
							2012-07-12 15:53:04 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									James Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								3ffcc4da7c 
								
							 
						 
						
							
							
								
								first pass at merging pycon's sponsorship app with more basic symposion one  
							
							
							
						 
						
							2012-07-12 15:17:49 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								32c8c0ce50 
								
							 
						 
						
							
							
								
								end with a newline  
							
							
							
						 
						
							2012-07-12 01:59:28 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								21ad87024d 
								
							 
						 
						
							
							
								
								add dashboard template  
							
							
							
						 
						
							2012-07-12 01:32:16 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								d31953b544 
								
							 
						 
						
							
							
								
								bring over forms and views form pycon for now  
							
							
							
						 
						
							2012-07-12 01:32:07 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								3ca56663a4 
								
							 
						 
						
							
							
								
								proposals templates  
							
							
							
						 
						
							2012-07-12 01:31:51 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								0426d8d877 
								
							 
						 
						
							
							
								
								speaker templates  
							
							
							
						 
						
							2012-07-12 01:31:41 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								df1f1dd2f4 
								
							 
						 
						
							
							
								
								update urls  
							
							
							
						 
						
							2012-07-12 01:31:29 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								33ee371975 
								
							 
						 
						
							
							
								
								fix package root/project root  
							
							
							
						 
						
							2012-07-12 01:21:14 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								674a5303ad 
								
							 
						 
						
							
							
								
								update urls  
							
							
							
						 
						
							2012-07-12 01:21:02 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								db95cb6180 
								
							 
						 
						
							
							
								
								add utils  
							
							
							
						 
						
							2012-07-12 01:20:55 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								abc8914cc6 
								
							 
						 
						
							
							
								
								modernize wsgi entry point  
							
							
							
						 
						
							2012-07-12 01:07:31 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								1243e2a8ab 
								
							 
						 
						
							
							
								
								add django-model-utils to project base  
							
							
							
						 
						
							2012-07-12 01:06:25 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								1a8c2d342d 
								
							 
						 
						
							
							
								
								add proposals and speakers to installed apps  
							
							
							
						 
						
							2012-07-12 01:06:12 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								1759cf569e 
								
							 
						 
						
							
							
								
								pycon conference fixture  
							
							
							
						 
						
							2012-07-12 00:39:29 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								6d9c1c2e5f 
								
							 
						 
						
							
							
								
								temporarily include pycon module containing advanced sponsorship app  
							
							
							
						 
						
							2012-07-12 00:39:15 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								7596922f4d 
								
							 
						 
						
							
							
								
								add proposals app from pycon  
							
							
							
						 
						
							2012-07-12 00:38:39 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								2b7f5546a0 
								
							 
						 
						
							
							
								
								add speakers app from pycon  
							
							
							
						 
						
							2012-07-12 00:38:24 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								76c4a7b79c 
								
							 
						 
						
							
							
								
								update conferences app  
							
							
							
						 
						
							2012-07-12 00:38:01 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								1f59ffa489 
								
							 
						 
						
							
							
								
								update project layout  
							
							
							
						 
						
							2012-07-11 18:51:09 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								3bed4f03c1 
								
							 
						 
						
							
							
								
								remove old project dir that seemed to come back with the merge commit  
							
							
							
						 
						
							2012-07-11 18:40:02 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								0430f166fe 
								
							 
						 
						
							
							
								
								Merge branch 'cms-features'  
							
							... 
							
							
							
							* cms-features:
  update theme and dua
  update cms/boxes to pycon parity
  update debug toolbar
  adding in basic nav
  get object or 404 on page objects
  move cms slug down to root url
  remove menu
  add side nav with sibling pages
  rename block
  add sibling pages to context
  add django-mptt to requirements
  remove mptt driven menu
  hook up django reversion
  adding menu context processor and hooking up template
  add ordering to menus and pages
  adding prototype cms app with pages and menu 
							
						 
						
							2012-07-11 18:36:52 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Luke Hatcher 
								
							 
						 
						
							
							
							
							
								
							
							
								5e7c15d51c 
								
							 
						 
						
							
							
								
								update theme and dua  
							
							... 
							
							
							
							Conflicts:
	requirements/base.txt 
							
						 
						
							2012-07-10 18:21:55 -04:00