Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base: bdc6a22f33
...
compare: 3b2ababc55
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
1  frontend/unicorn/templates/index.html
@@ -0,0 +1 @@
+...
View
4 frontend/unicorn/unicorn/admin.py
@@ -0,0 +1,4 @@
+from django.contrib import admin
+from verify.models import PatchInfo
+
+admin.site.register(PatchInfo)
View
46 frontend/unicorn/unicorn/settings.py
@@ -9,17 +9,31 @@
MANAGERS = ADMINS
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
- 'NAME': '', # Or path to database file if using sqlite3.
- # The following settings are not used with sqlite3:
- 'USER': '',
- 'PASSWORD': '',
- 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.
- 'PORT': '', # Set to empty string for default.
- }
-}
+if (DEBUG):
+ DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.sqlite3', # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+ 'NAME' : './database' # Or path to database file if using sqlite3.
+ }
+ }
+ TEMPLATE_DIRS = (
+ "/home/holden/repos/holdensmagicalunicorn/frontend/unicorn/templates",
+ # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+ # Always use forward slashes, even on Windows.
+ # Don't forget to use absolute paths, not relative paths.
+ )
+else:
+ DATABASES = {
+ 'default': {
+ 'ENGINE':'django.db.backends.mysql',
+ 'NAME':'hobogitquest',
+ 'USER':'',
+ 'PASSWORD':'',
+ 'HOST':'localhost',
+ 'PORT':'3306'
+ }
+ }
+
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -95,7 +109,7 @@
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
# Uncomment the next line for simple clickjacking protection:
- # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
+ #'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
ROOT_URLCONF = 'unicorn.urls'
@@ -103,12 +117,6 @@
# Python dotted path to the WSGI application used by Django's runserver.
WSGI_APPLICATION = 'unicorn.wsgi.application'
-TEMPLATE_DIRS = (
- # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
- # Always use forward slashes, even on Windows.
- # Don't forget to use absolute paths, not relative paths.
-)
-
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
@@ -121,6 +129,7 @@
# Uncomment the next line to enable admin documentation:
'django.contrib.admindocs',
'social_auth',
+ 'verify',
)
# A sample logging configuration. The only tangible logging
@@ -154,4 +163,5 @@
AUTHENTICATION_BACKENDS = (
'social_auth.backends.contrib.github.GithubBackend',
+ 'django.contrib.auth.backends.ModelBackend',
)
View
8 frontend/unicorn/unicorn/urls.py
@@ -1,17 +1,17 @@
from django.conf.urls import patterns, include, url
# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
+from django.contrib import admin
+admin.autodiscover()
urlpatterns = patterns('',
# Examples:
# url(r'^$', 'unicorn.views.home', name='home'),
- # url(r'^unicorn/', include('unicorn.foo.urls')),
# Uncomment the admin/doc line below to enable admin documentation:
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
# Uncomment the next line to enable the admin:
- # url(r'^admin/', include(admin.site.urls)),
+ url(r'^admin/', include(admin.site.urls)),
+ url(r'^/', include('unicorn.verify.urls')),
)
View
7 frontend/unicorn/verify/urls.py
@@ -0,0 +1,7 @@
+from django.conf.urls import patterns, url
+
+from verify import views
+
+urlpatterns = patterns('',
+ url(r'^$', views.index, name='index')
+)

No commit comments for this range

Something went wrong with that request. Please try again.