CopyleftConf/copyleftconf-website Changeset - 6c6d2e61c1d8

Changeset - 6c6d2e61c1d8

Parent rev.

Child rev.

[Not reviewed]

Merge

0 5 0

Christopher Neugebauer - 6 years ago 2017-11-13 01:00:50
chrisjrn@gmail.com

Merge branch 'wiki'

5 files changed with 31 insertions and 1 deletions:

pinaxcon/settings.py

pinaxcon/templates/_footer.html

pinaxcon/templates/static_pages/attend/hotels.html

pinaxcon/urls.py

requirements/base.txt

0 comments (0 inline, 0 general)

pinaxcon/settings.py

➞

Show inline comments

@@ ... / @@ -134,2 +134,3 @@ TEMPLATES = [ @@
                 "symposion.reviews.context_processors.reviews",
                 "sekizai.context_processors.sekizai",
             ],
@@ ... / @@ -139,2 +140,4 @@ TEMPLATES = [ @@
 TEMPLATE_DEBUG = False
 MIDDLEWARE_CLASSES = [
@@ ... / @@ -214,2 +217,14 @@ INSTALLED_APPS = [ @@
     # wiki
     'django.contrib.humanize',
     'django_nyt',
     'mptt',
     'sekizai',
     'sorl.thumbnail',
     'wiki',
     'wiki.plugins.attachments',
     'wiki.plugins.notifications',
     'wiki.plugins.images',
     'wiki.plugins.macros',
     # stylesheets and js
@@ ... / @@ -311,2 +326,9 @@ INVOICE_CURRENCY = "USD" @@
 WIKI_ACCOUNT_HANDLING = False
 WIKI_ACCOUNT_SIGNUP_ALLOWED = False
 WIKI_ANONYMOUS_WRITE = False
 WIKI_ANONYMOUS_UPLOAD = False
 # Use nose to run all tests

pinaxcon/templates/_footer.html

➞

Show inline comments

@@ ... / @@ -26,2 +26,3 @@ @@
       | <a href="https://twitter.com/northbaypython">Twitter</a>
       | <a href="/accessibility">Accessibility</a>
       | <a href="/code-of-conduct">Code of Conduct</a>

pinaxcon/templates/static_pages/attend/hotels.html

➞

Show inline comments

...		@@ -38,3 +38,3 @@

		<p>Hotel Petaluma has offered all of their available rooms to North Bay Python attendees, so if you want to stay as close as possible to the venue, book through our exclusive link ~~by November 1st~~.</p>
		<p>Hotel Petaluma has offered all of their available rooms to North Bay Python attendees, so if you want to stay as close as possible to the venue, book through our exclusive link.</p>

pinaxcon/urls.py

➞

Show inline comments

@@ ... / @@ -6,2 +6,4 @@ from django.views.generic import TemplateView @@
 from django.views.generic import RedirectView
 from django_nyt.urls import get_pattern as get_nyt_pattern
 from wiki.urls import get_pattern as get_wiki_pattern
@@ ... / @@ -87,2 +89,5 @@ urlpatterns = [ @@
     url(r'^wiki/notifications/', get_nyt_pattern()),
     url(r'^wiki/', get_wiki_pattern())
     # Catch-all MUST go last.
@@ ... / @@ -91,2 +96,3 @@ urlpatterns = [ @@
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

requirements/base.txt

➞

Show inline comments

0 comments (0 inline, 0 general)