| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Brian Rosner | 2c954c3a05 | Fixed slot rooms by using database more natively | 2012-08-30 11:52:11 -06: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 |  | 
				
					
						| 
								
								
									 Brian Rosner | 3ade1c5516 | Fixed typo in method name | 2012-08-30 01:04:08 -06:00 |  | 
				
					
						| 
								
								
									 Brian Rosner | 44d0ea6f2b | Moved colspan to slot in TimeTable | 2012-08-30 01:02:49 -06:00 |  | 
				
					
						| 
								
								
									 Brian Rosner | d7b3696c6e | Fixed room lookup bug | 2012-08-30 00:58:16 -06:00 |  | 
				
					
						| 
								
								
									 Brian Rosner | 69097d86c9 | Fixed rooms queryset to be ordered | 2012-08-30 00:57:02 -06:00 |  | 
				
					
						| 
								
								
									 Brian Rosner | 14f43da962 | Corrected naming | 2012-08-30 00:53:31 -06:00 |  | 
				
					
						| 
								
								
									 Brian Rosner | 7601791e8c | Fixed tons of little bugs | 2012-08-30 00:52:50 -06:00 |  | 
				
					
						| 
								
								
									 Brian Rosner | f3e9cc9a5d | Added TimeTable | 2012-08-30 00:51:07 -06:00 |  | 
				
					
						| 
								
								
									 Brian Rosner | bec6903ca1 | Fixed slug bug | 2012-08-30 00:23:49 -06:00 |  | 
				
					
						| 
								
								
									 Brian Rosner | 0a4e626dfe | Started detail and edit views with slug field to Schedule | 2012-08-30 00:21:48 -06:00 |  | 
				
					
						| 
								
								
									 Brian Rosner | 77dc781e0d | Improved schedule models and behavior This allows for full slot creation now. | 2012-08-29 23:58:03 -06:00 |  | 
				
					
						| 
								
								
									 Brian Rosner | 143dbbce28 | added schedule models (not fully complete) | 2012-08-29 19:53:15 -06:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 53923c5a7a | add tabletools | 2012-08-27 14:33:41 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 17e9016981 | add datatables and tabletools | 2012-08-27 14:32:59 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 6bfd617e99 | add message to reviewers when proposal is updated | 2012-08-27 14:12:19 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 2da59c13bf | bump version | 2012-08-25 20:01:48 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 54991cd4d1 | only run generator on proposals with a selected status | 2012-08-25 20:00:13 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 6ee3ff5d45 | use generator to ensure proposals are filtered by speaker | 2012-08-25 19:54:17 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | d427ef2941 | proposal_count is unused | 2012-08-25 19:52:58 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 1cb22cea95 | restrict status view to reviewers | 2012-08-25 19:52:07 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 86b698a228 | bump version | 2012-08-25 19:04:32 -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 |  | 
				
					
						| 
								
								
									 Brian Rosner | a9aff9d637 | bumped version to 1.0b1.dev11 | 2012-08-22 16:01:24 -06:00 |  | 
				
					
						| 
								
								
									 Brian Rosner | cee36ad983 | modified copy for invite form on team to read more clearly | 2012-08-22 15:56:22 -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 | 445e628d64 | bump version | 2012-08-14 18:49:18 -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 | b05b389320 | bump version | 2012-08-14 17:25:52 -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 |  | 
				
					
						| 
								
								
									 Luke Hatcher | c7dd6e6f8d | add section to review_section context | 2012-08-14 17:22:54 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 7f0c8496c7 | fix email bug with teams | 2012-08-14 17:22:54 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 69663679cc | fix dashboard issue | 2012-08-14 17:22:54 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 7b4c5cd205 | add review message form | 2012-08-14 17:22:54 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | e00b646f20 | added method for determining if section is open for proposals and redirect away from form if not | 2012-08-14 17:09:51 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 25a8088984 | dev5 | 2012-08-14 16:28:13 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 553b47dc30 | ready for 1.0b1.dev4 release | 2012-08-14 15:53:16 -04:00 |  |