From 6b41f87b67efb0602767ac3389517f4759880911 Mon Sep 17 00:00:00 2001 From: David Ray Date: Tue, 14 Jan 2014 08:13:57 -0500 Subject: [PATCH 001/146] update requirements file to pull in symposion from pyohio fork --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ab02226..e705524 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ Django==1.4.5 django-user-accounts==1.0b8 -symposion==1.0b1 +-e git://github.com/pyohio/symposion.git#egg=symposion pinax-theme-bootstrap==3.0a4 metron==0.1 # 0.2.dev3 pinax-utils==1.0b1.dev3 From d7dc40eece84e6e7d6e458e0b25a330bb6a206d1 Mon Sep 17 00:00:00 2001 From: David Ray Date: Tue, 14 Jan 2014 08:16:52 -0500 Subject: [PATCH 002/146] reset readme for 2014 --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 39ab515..8f03388 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# PyOhio 2013 +# PyOhio 2014 -Conference website for PyOhio 2013, built on Symposion. +Conference website for PyOhio 2014, built on Symposion. ## Quickstart @@ -11,5 +11,3 @@ Conference website for PyOhio 2013, built on Symposion. ## Todo - Deployment -- Update theme to match PyOhio branding -- Update proposal models and fixtures to match PyOhio proposal types From 721d011f7f9a6ed052d8009cd432c1238de7e2d4 Mon Sep 17 00:00:00 2001 From: David Ray Date: Tue, 14 Jan 2014 09:04:08 -0500 Subject: [PATCH 003/146] Update 2013 references to 2014 --- pyohio/settings.py | 14 +++++++------- pyohio/settings_gondor.py | 2 +- pyohio/templates/_footer.html | 4 ++-- refresh.sh | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pyohio/settings.py b/pyohio/settings.py index d832574..b65929a 100644 --- a/pyohio/settings.py +++ b/pyohio/settings.py @@ -26,7 +26,7 @@ DATABASES = { "default": { "ENGINE": "django.db.backends.postgresql_psycopg2", # Add "postgresql_psycopg2", "postgresql", "mysql", "sqlite3" or "oracle". - "NAME": "pyohio-2013", # Or path to database file if using sqlite3. + "NAME": "pyohio-2014", # Or path to database file if using sqlite3. "USER": "", # Not used with sqlite3. "PASSWORD": "", # Not used with sqlite3. "HOST": "", # Set to empty string for localhost. Not used with sqlite3. @@ -134,11 +134,11 @@ "django.contrib.messages", "django.contrib.staticfiles", "django.contrib.humanize", - + # theme "pinax_theme_bootstrap", "django_forms_bootstrap", - + # external "debug_toolbar", "mailer", @@ -150,7 +150,7 @@ "easy_thumbnails", "sitetree", "account", - + # symposion "symposion", "symposion.sponsorship", @@ -162,7 +162,7 @@ "symposion.teams", "symposion.reviews", "symposion.schedule", - + # project "pyohio.proposals", ] @@ -190,7 +190,7 @@ AUTHENTICATION_BACKENDS = [ # Permissions Backends "symposion.teams.backends.TeamPermissionsBackend", - + # Auth backends "account.auth_backends.EmailAuthenticationBackend", ] @@ -218,7 +218,7 @@ "open-space": "pyohio.proposals.forms.OpenSpaceProposalForm", } -SESSION_COOKIE_NAME = "PYOHIO2013" +SESSION_COOKIE_NAME = "PYOHIO2014" # local_settings.py can be used to override environment-specific settings # like database and email that differ between development and production. diff --git a/pyohio/settings_gondor.py b/pyohio/settings_gondor.py index c06ef42..ccc943a 100644 --- a/pyohio/settings_gondor.py +++ b/pyohio/settings_gondor.py @@ -73,7 +73,7 @@ } } -DEFAULT_FROM_EMAIL = "PyOhio 2013 " +DEFAULT_FROM_EMAIL = "PyOhio 2014 " if "GONDOR_SENDGRID_USER" in os.environ: EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend" diff --git a/pyohio/templates/_footer.html b/pyohio/templates/_footer.html index 4c13e6c..ec1c906 100644 --- a/pyohio/templates/_footer.html +++ b/pyohio/templates/_footer.html @@ -1,9 +1,9 @@ {% load i18n %}