James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d362300bb
								
							
						 | 
						
							
							
								
								improved styling on email form
							
							
							
							
							
						 | 
						
							2012-09-08 18:49:19 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								8cb9a41f41
								
							
						 | 
						
							
							
								
								first pass at result notification prepare template
							
							
							
							
							
						 | 
						
							2012-09-08 18:39:38 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								5f8e8f195c
								
							
						 | 
						
							
							
								
								get template select sending proper name/value
							
							
							
							
							
						 | 
						
							2012-09-08 18:32:06 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								6186a913df
								
							
						 | 
						
							
							
								
								initial template selection tweaks to result notification
							
							
							
							
							
						 | 
						
							2012-09-08 18:19:06 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Brian Rosner
								
							 
						 | 
						
							
							
							
							
								
							
							
								5fefff0a3d
								
							
						 | 
						
							
							
								
								added result_notification_prepare view and stubbed out result_notification_send
							
							
							
							
							
						 | 
						
							2012-09-07 18:11:43 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c2a0de89d
								
							
						 | 
						
							
							
								
								change attr to prop
							
							
							
							
							
						 | 
						
							2012-09-06 23:51:54 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								4435d957fc
								
							
						 | 
						
							
							
								
								more tweaks to selection javascript but still has select all bug
							
							
							
							
							
						 | 
						
							2012-09-06 22:54:52 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								3dd7468365
								
							
						 | 
						
							
							
								
								first pass at models and view for table with selection
							
							
							
							
							
						 | 
						
							2012-09-06 22:36:40 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								39769a5556
								
							
						 | 
						
							
							
								
								cleaned up review status buttons
							
							
							
							
							
						 | 
						
							2012-09-02 15:13:23 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								8f5291b539
								
							
						 | 
						
							
							
								
								switched from reserve to standby and added support in UI review detail
							
							
							
							
							
						 | 
						
							2012-09-02 15:04:17 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								0422855582
								
							
						 | 
						
							
							
								
								switched from using nullboolean accepted on proposal result to a more flexible status choice
							
							
							
							
							
						 | 
						
							2012-09-02 14:45:41 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								240eb42df4
								
							
						 | 
						
							
							
								
								add chosen
							
							
							
							
							
						 | 
						
							2012-08-31 02:32:30 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								14870dd5b0
								
							
						 | 
						
							
							
								
								removed old facebox reference
							
							
							
							
							
						 | 
						
							2012-08-31 01:54:30 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								79e94d6f54
								
							
						 | 
						
							
							
								
								fix edit
							
							
							
							
							
						 | 
						
							2012-08-31 01:52:45 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								36ceef63ed
								
							
						 | 
						
							
							
								
								no animation
							
							
							
							
							
						 | 
						
							2012-08-31 01:52:45 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								13bc9ffacb
								
							
						 | 
						
							
							
								
								add schedule list
							
							
							
							
							
						 | 
						
							2012-08-31 01:52:45 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								9bcfcb62e4
								
							
						 | 
						
							
							
								
								improved styling of schedule edit
							
							
							
							
							
						 | 
						
							2012-08-31 01:52:04 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								d873283667
								
							
						 | 
						
							
							
								
								add class to form button
							
							
							
							
							
						 | 
						
							2012-08-31 01:00:43 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								09bce70aed
								
							
						 | 
						
							
							
								
								edit schedule templates
							
							
							
							
							
						 | 
						
							2012-08-31 00:57:53 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								69877075c7
								
							
						 | 
						
							
							
								
								use button dropdown to convey accept/reject state as well as actions
							
							
							
							
							
						 | 
						
							2012-08-31 00:31:10 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								82754d2342
								
							
						 | 
						
							
							
								
								enable proposal acceptance
							
							
							
							
							
						 | 
						
							2012-08-30 22:37:01 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								5c1916352c
								
							
						 | 
						
							
							
								
								include class indicating slot kind
							
							
							
							
							
						 | 
						
							2012-08-30 22:31:59 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								b4ec8dc29b
								
							
						 | 
						
							
							
								
								only show add if the slot is for a talk
							
							
							
							
							
						 | 
						
							2012-08-30 22:26:37 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								358b466d17
								
							
						 | 
						
							
							
								
								Merge branch 'master' into new-schedule
							
							
							
							
							
						 | 
						
							2012-08-30 21:10:46 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								34a9d07bb7
								
							
						 | 
						
							
							
								
								remove old css
							
							
							
							
							
						 | 
						
							2012-08-30 14:07:15 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								38e2124c64
								
							
						 | 
						
							
							
								
								work in progress improvements to schedule edit styling
							
							
							
							
							
						 | 
						
							2012-08-30 12:26:41 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								95d182e528
								
							
						 | 
						
							
							
								
								use full span12 on schedule edit
							
							
							
							
							
						 | 
						
							2012-08-30 12:17:10 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								746e34cf3c
								
							
						 | 
						
							
							
								
								work in progress on schedule edit template
							
							
							
							
							
						 | 
						
							2012-08-30 03:14:46 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								53923c5a7a
								
							
						 | 
						
							
							
								
								add tabletools
							
							
							
							
							
						 | 
						
							2012-08-27 14:33:41 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								6bfd617e99
								
							
						 | 
						
							
							
								
								add message to reviewers when proposal is updated
							
							
							
							
							
						 | 
						
							2012-08-27 14:12:19 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								6ee3ff5d45
								
							
						 | 
						
							
							
								
								use generator to ensure proposals are filtered by speaker
							
							
							
							
							
						 | 
						
							2012-08-25 19:54:17 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								8bd7998034
								
							
						 | 
						
							
							
								
								add proposal leave template
							
							
							
							
							
						 | 
						
							2012-08-24 11:46:17 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Brian Rosner
								
							 
						 | 
						
							
							
							
							
								
							
							
								32155ff1ea
								
							
						 | 
						
							
							
								
								added Speaker Bio to proposal display fields
							
							
							
							
							
						 | 
						
							2012-08-22 16:32:47 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Brian Rosner
								
							 
						 | 
						
							
							
							
							
								
							
							
								be877c19d6
								
							
						 | 
						
							
							
								
								spelt out Additional
							
							
							
							
							
						 | 
						
							2012-08-22 16:29:12 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Brian Rosner
								
							 
						 | 
						
							
							
							
							
								
							
							
								70351b3714
								
							
						 | 
						
							
							
								
								moved Audience Level to a more logical spot in _proposal_fields
							
							
							
							
							
						 | 
						
							2012-08-22 16:28:42 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								4aab28c8ef
								
							
						 | 
						
							
							
								
								always use user_display for comments
							
							
							
							
							
						 | 
						
							2012-08-17 15:38:23 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								6ded9f0b14
								
							
						 | 
						
							
							
								
								fix user display issue with proposal comments
							
							
							
							
							
						 | 
						
							2012-08-17 15:19:01 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3b7de4890
								
							
						 | 
						
							
							
								
								move comment form below conversation
							
							
							
							
							
						 | 
						
							2012-08-14 18:48:50 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								aec89beaaa
								
							
						 | 
						
							
							
								
								use proposals base for all proposals templates
							
							
							
							
							
						 | 
						
							2012-08-14 18:41:18 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								0ea559bae1
								
							
						 | 
						
							
							
								
								include documents
							
							
							
							
							
						 | 
						
							2012-08-14 17:22:55 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								8457c8d5ac
								
							
						 | 
						
							
							
								
								remove second additional notes
							
							
							
							
							
						 | 
						
							2012-08-14 17:22:55 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								7a9c01c11a
								
							
						 | 
						
							
							
								
								fix label so it isn't cut off
							
							
							
							
							
						 | 
						
							2012-08-14 17:22:54 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								6d7971e097
								
							
						 | 
						
							
							
								
								fix addl speaker display
							
							
							
							
							
						 | 
						
							2012-08-14 17:22:54 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								0aca96152f
								
							
						 | 
						
							
							
								
								made voting threshold configurable
							
							
							
							
							
						 | 
						
							2012-08-14 15:52:23 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 |