Merge branch 'docs' of github.com:cosmologist10/junction into docs

cosmologist10 · cosmologist10 · commit 8fa8e12a9ae0 · 2017-04-09T22:00:03.000+05:30
diff --git a/junction/base/monkey.py b/junction/base/monkey.py
@@ -36,9 +36,9 @@ def patch_urlresolvers():
 
     old_reverse = urlresolvers.reverse
 
-
     def new_reverse(viewname, urlconf=None, args=None, kwargs=None, current_app=None):
-        path = old_reverse(viewname, urlconf=urlconf, args=args, kwargs=kwargs, current_app=current_app)
+        path = old_reverse(viewname, urlconf=urlconf, args=args, kwargs=kwargs,
+                           current_app=current_app)
         if is_absolute_url(path):
             return path
 
diff --git a/junction/templates/account/email.html b/junction/templates/account/email.html
@@ -1,6 +1,6 @@
 {% extends "account/base.html" %}
 {% load i18n %}
-{% load url from future %}
+
 
 {% load django_bootstrap_breadcrumbs %}
 
diff --git a/junction/templates/account/email_confirm.html b/junction/templates/account/email_confirm.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 {% load account %}
 {% load django_bootstrap_breadcrumbs %}
diff --git a/junction/templates/account/logout.html b/junction/templates/account/logout.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% load django_bootstrap_breadcrumbs %}
diff --git a/junction/templates/account/password_change.html b/junction/templates/account/password_change.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 {% load django_bootstrap_breadcrumbs %}
 
diff --git a/junction/templates/account/password_reset.html b/junction/templates/account/password_reset.html
@@ -1,7 +1,7 @@
 {% extends "account/base.html" %}
 {% load i18n %}
 {% load account %}
-{% load url from future %}
+
 {% load django_bootstrap_breadcrumbs %}
 
 {% block head_title %}{% trans "Password Reset" %} · {{ block.super }}{% endblock %}
diff --git a/junction/templates/account/password_reset_from_key.html b/junction/templates/account/password_reset_from_key.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load django_bootstrap_breadcrumbs %}
 {% load i18n %}
 
diff --git a/junction/templates/account/password_reset_from_key_done.html b/junction/templates/account/password_reset_from_key_done.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load django_bootstrap_breadcrumbs %}
 {% load i18n %}
 
diff --git a/junction/templates/account/password_set.html b/junction/templates/account/password_set.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 {% load django_bootstrap_breadcrumbs %}
 
diff --git a/junction/templates/account/signup.html b/junction/templates/account/signup.html
@@ -1,6 +1,6 @@
 {% extends "account/base.html" %}
 {% load i18n %}
-{% load url from future %}
+
 {% load django_bootstrap_breadcrumbs %}
 
 {% block head_title %}{% trans "Sign Up" %} · {{ block.super }}{% endblock %}
diff --git a/junction/templates/account/signup_closed.html b/junction/templates/account/signup_closed.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% load django_bootstrap_breadcrumbs %}
diff --git a/junction/templates/openid/login.html b/junction/templates/openid/login.html
@@ -1,5 +1,5 @@
 {% extends "openid/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% block head_title %}OpenID Sign In{% endblock %}
diff --git a/junction/templates/proposals/closed.html b/junction/templates/proposals/closed.html
@@ -2,7 +2,6 @@
 {% load bootstrap3 %}
 {% load static from staticfiles %}
 {% load django_bootstrap_breadcrumbs %}
-{% load url from future %}
 {% load i18n %}
 
 {% block head_title %} CFP submission is closed | {{ block.super }} {% endblock %}
@@ -20,7 +19,7 @@
             <div class="form-container space-2-bottom">
                 <h2 class="fill-blue text-center">{% trans "CFP submission is closed" %}</h2>
                 <div class="pad-2 push-1-top push-2-bottom text-center">
-    				<p>{% trans "We are no longer accepting proposals. You can prepare a session for open spaces or flash talks." %}</p>
+                    <p>{% trans "We are no longer accepting proposals. You can prepare a session for open spaces or flash talks." %}</p>
                 </div>
             </div>
         </div>
diff --git a/junction/templates/socialaccount/connections.html b/junction/templates/socialaccount/connections.html
@@ -1,6 +1,6 @@
 {% extends "socialaccount/base.html" %}
 {% load i18n %}
-{% load url from future %}
+
 {% load django_bootstrap_breadcrumbs %}
 
 {% block breadcrumbs %}
diff --git a/junction/templates/socialaccount/login_cancelled.html b/junction/templates/socialaccount/login_cancelled.html
@@ -1,5 +1,5 @@
 {% extends "socialaccount/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% block head_title %}{% trans "Login Cancelled" %}{% endblock %}
diff --git a/junction/templates/socialaccount/signup.html b/junction/templates/socialaccount/signup.html
@@ -1,5 +1,5 @@
 {% extends "socialaccount/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% block head_title %}{% trans "Signup" %}{% endblock %}
diff --git a/junction/tickets/migrations/0002_auto_20170404_2243.py b/junction/tickets/migrations/0002_auto_20170404_2243.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ticket',
+            name='email',
+            field=models.EmailField(max_length=254),
+        ),
+    ]
diff --git a/junction/tickets/migrations/0004_merge.py b/junction/tickets/migrations/0004_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2017-04-05 17:12
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0003_merge'),
+        ('tickets', '0002_auto_20170404_2243'),
+    ]
+
+    operations = [
+    ]
diff --git a/junction/urls.py b/junction/urls.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
+import junction.proposals.dashboard
+import django.views.defaults
 
 # Third Party Stuff
-from django.conf import settings
 from django.conf.urls import include, url
+from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.views.generic.base import RedirectView, TemplateView
@@ -33,7 +35,6 @@
 reference to them here.
 '''
 
-import junction.proposals.dashboard
 
 urlpatterns = [
 
@@ -104,7 +105,6 @@
 
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
-import django.views.defaults
 
 if settings.DEBUG:
     urlpatterns += [
