Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								5e7c15d51c
								
							
						 | 
						
							
							
								
								update theme and dua
							
							
							
							
							
							
							
							Conflicts:
	requirements/base.txt 
							
						 | 
						
							2012-07-10 18:21:55 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								962dc1eb23
								
							
						 | 
						
							
							
								
								update debug toolbar
							
							
							
							
							
						 | 
						
							2012-07-10 18:20:49 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								c1b7550ed8
								
							
						 | 
						
							
							
								
								added BSD license
							
							
							
							
							
						 | 
						
							2012-06-05 15:13:29 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								8dac027fff
								
							
						 | 
						
							
							
								
								Update master
							
							
							
							
							
						 | 
						
							2012-06-04 18:17:38 -03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								83fae25b60
								
							
						 | 
						
							
							
								
								Merge pull request #9 from pinax/dua
							
							
							
							
							
							
							
							upgrade to latest Django, Pinax and django-user-accounts 
							
						 | 
						
							2012-06-04 14:13:48 -07: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								e3c79c056c
								
							
						 | 
						
							
							
								
								updated manage.py
							
							
							
							
							
						 | 
						
							2012-05-29 15:00:42 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								e96fe0bd5e
								
							
						 | 
						
							
							
								
								updated requirements to 1.4 / DUA and latest versions
							
							
							
							
							
						 | 
						
							2012-05-29 15:00:14 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								09aa60777f
								
							
						 | 
						
							
							
								
								updated project layout for 1.4 (without content changes)
							
							
							
							
							
						 | 
						
							2012-05-29 14:53:04 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Luke Hatcher
								
							 
						 | 
						
							
							
							
							
								
							
							
								7f8c614fc2
								
							
						 | 
						
							
							
								
								update theme
							
							
							
							
							
						 | 
						
							2012-05-21 17:17:14 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								d5ea3163da
								
							
						 | 
						
							
							
								
								Merge pull request #4 from pinax/sponsorship
							
							
							
							
							
							
							
							Sponsorship 
							
						 | 
						
							2012-03-12 19:46:52 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								e614c907da
								
							
						 | 
						
							
							
								
								Merge branch 'fresh-start' into sponsorship
							
							
							
							
							
						 | 
						
							2012-02-22 17:37:16 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe0473a24a
								
							
						 | 
						
							
							
								
								fixed coding convention nits
							
							
							
							
							
						 | 
						
							2012-02-22 17:37:05 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								de0cf9f163
								
							
						 | 
						
							
							
								
								internationalized the sponsor model fields
							
							
							
							
							
						 | 
						
							2012-02-22 17:35:21 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								b2f8919843
								
							
						 | 
						
							
							
								
								Merge branch 'fresh-start' into sponsorship
							
							
							
							
							
						 | 
						
							2012-02-22 17:19:17 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								05100add88
								
							
						 | 
						
							
							
								
								Merge pull request #6 from zerok/conference-i18n
							
							
							
							
							
							
							
							Makes conference app fields and models localizable 
							
						 | 
						
							2012-02-22 14:00:34 -08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Horst Gutmann
								
							 
						 | 
						
							
							
							
							
								
							
							
								e305e6b6e4
								
							
						 | 
						
							
							
								
								Makes conference app fields and models localizable
							
							
							
							
							
						 | 
						
							2012-02-19 19:54:36 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								a88485b46f
								
							
						 | 
						
							
							
								
								Merge branch 'fresh-start' into sponsorship
							
							
							
							
							
							
							
							Conflicts:
	symposion_project/docs/index.rst 
							
						 | 
						
							2012-02-05 23:07:02 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								d6a73b2c64
								
							
						 | 
						
							
							
								
								added documentation for conference models
							
							
							
							
							
						 | 
						
							2012-02-05 23:06:16 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								ef2624698b
								
							
						 | 
						
							
							
								
								made sponsorship app conference-aware
							
							
							
							
							
						 | 
						
							2012-02-05 22:50:47 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								78f05157d2
								
							
						 | 
						
							
							
								
								Merge branch 'fresh-start' into sponsorship
							
							
							
							
							
						 | 
						
							2012-02-05 22:34:52 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								97b6321f9f
								
							
						 | 
						
							
							
								
								implemented notion of CONFERENCE_ID setting and current_conference() function
							
							
							
							
							
						 | 
						
							2012-02-05 22:34:12 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e78e1ace3
								
							
						 | 
						
							
							
								
								Merge branch 'fresh-start' into sponsorship
							
							
							
							
							
							
							
							Conflicts:
	symposion_project/settings.py 
							
						 | 
						
							2012-02-05 22:04:54 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b94e40059
								
							
						 | 
						
							
							
								
								added pyc and dev.db to gitignore
							
							
							
							
							
						 | 
						
							2012-02-05 21:59:53 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								37e6d51792
								
							
						 | 
						
							
							
								
								initial conference/section models
							
							
							
							
							
						 | 
						
							2012-02-05 21:59:14 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d6a69466b
								
							
						 | 
						
							
							
								
								initial documentation of sponsorship app
							
							
							
							
							
						 | 
						
							2012-02-05 18:18:30 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2c6810460
								
							
						 | 
						
							
							
								
								Merge branch 'fresh-start' into sponsorship
							
							
							
							
							
						 | 
						
							2012-02-05 17:51:52 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								57e6ccf2ca
								
							
						 | 
						
							
							
								
								Merge branch 'initial-docs' into fresh-start
							
							
							
							
							
						 | 
						
							2012-02-05 17:51:24 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								c4b03049ed
								
							
						 | 
						
							
							
								
								added some initial wording to the docs
							
							
							
							
							
						 | 
						
							2012-02-05 17:51:04 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								df720729a0
								
							
						 | 
						
							
							
								
								added gitignore with docs _build
							
							
							
							
							
						 | 
						
							2012-02-05 17:45:46 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								a3cae9f764
								
							
						 | 
						
							
							
								
								initial sphinx configuration
							
							
							
							
							
						 | 
						
							2012-02-05 17:32:14 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								cfc5db0a08
								
							
						 | 
						
							
							
								
								upgraded bootstrap theme
							
							
							
							
							
						 | 
						
							2012-02-05 17:14:46 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4e7b890a2
								
							
						 | 
						
							
							
								
								added sponsorship template tags and template fragments; improved admin
							
							
							
							
							
						 | 
						
							2012-02-05 17:13:06 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								64569bccc7
								
							
						 | 
						
							
							
								
								fixed incorrect module name in import
							
							
							
							
							
						 | 
						
							2012-02-05 15:51:27 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								46e38bc758
								
							
						 | 
						
							
							
								
								initial sponsorship app adapted from DjangoCon
							
							
							
							
							
						 | 
						
							2012-02-05 15:03:30 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f6843b08d
								
							
						 | 
						
							
							
								
								pinax account project
							
							
							
							
							
						 | 
						
							2012-02-05 13:53:49 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								086d2d1cc0
								
							
						 | 
						
							
							
								
								first commit
							
							
							
							
							
						 | 
						
							2012-02-05 13:38:52 -05:00 | 
						
						
							
							
							
								
							
							
						 |