| 
								
								
									 James Tauber | eb2382d3ac | staff can now see all teams on dashboard | 2012-08-02 10:17:01 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 9a23c142e8 | tweaked available teams tag to avoid overlap | 2012-08-01 23:02:53 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 1bfd0cc2f0 | implemented team apply | 2012-08-01 22:59:41 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | a4dea58195 | implemented join/leave teams | 2012-08-01 22:49:27 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 4f888ffd57 | include state in team detail context vars | 2012-08-01 22:28:57 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 3998fe3369 | properly link to and control access to team detail page | 2012-08-01 21:59:23 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 40f4d1bb8d | display available teams on dashboard and remove debugging print | 2012-08-01 21:49:54 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 6e67b50501 | added available teams template tag | 2012-08-01 21:39:00 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 5dfd74c360 | permissions backend based on team membership | 2012-07-31 15:24:26 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 86a346f628 | view and url from team detail page | 2012-07-28 18:30:00 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | a907b78bd1 | added helper method to determine team membership state for a user | 2012-07-28 18:29:19 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 283ac696ef | teams model tweaks and initial dashboard | 2012-07-28 18:10:15 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 69d3df83c1 | initial team models and admin | 2012-07-28 17:05:01 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 584392e897 | sponsor signals to handle benefits | 2012-07-18 19:24:46 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 53e37d6ec0 | properties for logo and listing text benefits | 2012-07-18 19:23:59 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 02a8e274f7 | update admin views for sponsors | 2012-07-18 19:22:41 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 4be04a3800 | don't allow adding documents to cancelled proposals | 2012-07-18 19:22:29 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 07e98036b7 | handle cases where USE_X_ACCEL_REDIRECT is not defined | 2012-07-18 19:21:50 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 63d07f8db3 | mark strings for i18n | 2012-07-18 19:21:21 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 55ec9b745a | add our more liberal markdown parser to symposion | 2012-07-18 19:20:51 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 6cf7a62da1 | track revisions for proposals, boxes and add reversion admin to all | 2012-07-18 19:19:59 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 022d62721d | fix pycon imports | 2012-07-13 21:45:13 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | 836166f4b3 | remove extra speaker profile fields | 2012-07-13 21:43:08 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 9d367667f2 | got sponsorship app flow working, adding missing templates, etc | 2012-07-13 08:59:25 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | dc11411a4a | added first pass of documentation about proposals | 2012-07-12 16:38:42 -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 | 3ffcc4da7c | first pass at merging pycon's sponsorship app with more basic symposion one | 2012-07-12 15:17:49 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | d31953b544 | bring over forms and views form pycon for now | 2012-07-12 01:32:07 -04:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | db95cb6180 | add utils | 2012-07-12 01:20:55 -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 | 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 | 1191608a8a | use django-forms-bootstrap | 2012-05-29 21:50:46 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 44fb5325f1 | fixed account links on homepage | 2012-05-29 15:34:14 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 9477c92abf | fixed staticfiles settings | 2012-05-29 15:30:35 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 6160ede722 | removed homepage use of ifsetting_tag | 2012-05-29 15:17:08 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 02319e51c8 | updated urls | 2012-05-29 15:16:41 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 303877add6 | updated templates | 2012-05-29 15:12:22 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 4b87c51251 | updated imports to reflect new layout | 2012-05-29 15:12:03 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | c9e600e42c | updated imports to reflect new layout | 2012-05-29 15:08:05 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | fc69aa85e8 | updated settings | 2012-05-29 15:06:24 -04:00 |  | 
				
					
						| 
								
								
									 James Tauber | 09aa60777f | updated project layout for 1.4 (without content changes) | 2012-05-29 14:53:04 -04:00 |  |