Revert "fix conflict #2"

This reverts commit fde9b04, reversing changes made to 8534c5e.
NDLUG · Feb 5, 2016 · 11626c1 · 11626c1
1 parent fde9b04
commit 11626c1
Show file tree

Hide file tree

Showing 19 changed files with 1 addition and 334 deletions.
diff --git a/ndlug/settings.py b/ndlug/settings.py
@@ -38,10 +38,7 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'announcements',
-    'voting',
-    'secretballot',
-    'django_extensions',
-    'likes',
+    # 'polls',
 ]
 
 MIDDLEWARE_CLASSES = [
@@ -53,8 +50,6 @@
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'secretballot.middleware.SecretBallotIpMiddleware',
-    'likes.middleware.SecretBallotUserIpUseragentMiddleware',
 ]
 
 ROOT_URLCONF = 'ndlug.urls'
@@ -70,7 +65,6 @@
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
-                'django.template.context_processors.request',
             ],
         },
     },

diff --git a/ndlug/urls.py b/ndlug/urls.py
@@ -20,6 +20,4 @@
 urlpatterns = [
     url(r'^$', include('announcements.urls')),
     url(r'^admin/', admin.site.urls),
-    url(r'^likes/', include('likes.urls')),
-    url(r'^voting/', include('voting.urls')),
 ]
diff --git a/requirements.txt b/requirements.txt
@@ -4,8 +4,6 @@ appnope==0.1.0
 argparse==1.2.1
 decorator==4.0.6
 dj-database-url==0.3.0
-django-extensions==1.6.1
-django-likes==0.2
 gunicorn==19.4.5
 ipdb==0.8.1
 ipython==4.1.0
@@ -16,7 +14,6 @@ pickleshare==0.6
 psycopg2==2.6.1
 ptyprocess==0.5.1
 simplegeneric==0.8.1
-six==1.10.0
 traitlets==4.1.0
 whitenoise==2.0.6
 wsgiref==0.1.2
diff --git a/secretballot/__init__.py b/secretballot/__init__.py
diff --git a/secretballot/middleware.py b/secretballot/middleware.py
diff --git a/secretballot/migrations/0001_initial.py b/secretballot/migrations/0001_initial.py
diff --git a/secretballot/migrations/__init__.py b/secretballot/migrations/__init__.py
diff --git a/secretballot/models.py b/secretballot/models.py
diff --git a/secretballot/views.py b/secretballot/views.py
diff --git a/voting/__init__.py b/voting/__init__.py
diff --git a/voting/admin.py b/voting/admin.py
diff --git a/voting/apps.py b/voting/apps.py
diff --git a/voting/migrations/0001_initial.py b/voting/migrations/0001_initial.py
diff --git a/voting/migrations/__init__.py b/voting/migrations/__init__.py
diff --git a/voting/models.py b/voting/models.py
diff --git a/voting/templates/voting/index.html b/voting/templates/voting/index.html
diff --git a/voting/tests.py b/voting/tests.py
diff --git a/voting/urls.py b/voting/urls.py
diff --git a/voting/views.py b/voting/views.py