Update all requirements
parent
74064a5389
commit
833439246b
|
@ -7,4 +7,4 @@ router = routers.DefaultRouter()
|
|||
router.register(r'jobs', views.JobView, base_name='jobs')
|
||||
router.register(r'data', views.DataView, base_name='data')
|
||||
|
||||
urlpatterns = router.urls
|
||||
api_urlpatterns = router.urls
|
||||
|
|
|
@ -24,7 +24,7 @@ class JobView(viewsets.ReadOnlyModelViewSet):
|
|||
|
||||
def get_queryset(self):
|
||||
queryset = self.queryset.filter(start__gte=now())
|
||||
gs_id = self.request.QUERY_PARAMS.get('ground_station', None)
|
||||
gs_id = self.request.query_params.get('ground_station', None)
|
||||
if gs_id and self.request.user.is_authenticated():
|
||||
gs = get_object_or_404(Station, id=gs_id)
|
||||
if gs.owner == self.request.user:
|
||||
|
|
|
@ -1,28 +1,26 @@
|
|||
from django.conf.urls import patterns, url
|
||||
from django.views.generic import TemplateView
|
||||
|
||||
from network.base.views import StationAllView
|
||||
from network.base import views
|
||||
|
||||
urlpatterns = patterns(
|
||||
'network.base.views',
|
||||
url(r'^$', 'index', name='home'),
|
||||
base_urlpatterns = ([
|
||||
url(r'^$', views.index, name='home'),
|
||||
url(r'^about/$', TemplateView.as_view(template_name='base/about.html'), name='about'),
|
||||
url(r'^robots\.txt$', 'robots', name='robots'),
|
||||
url(r'^settings_site/$', 'settings_site', name='settings_site'),
|
||||
url(r'^robots\.txt$', views.robots, name='robots'),
|
||||
url(r'^settings_site/$', views.settings_site, name='settings_site'),
|
||||
|
||||
# Observations
|
||||
url(r'^observations/$', 'observations_list', name='observations_list'),
|
||||
url(r'^observations/(?P<id>[0-9]+)/$', 'observation_view', name='observation_view'),
|
||||
url(r'^observations/(?P<id>[0-9]+)/delete/$', 'observation_delete', name='observation_delete'),
|
||||
url(r'^observations/new/$', 'observation_new', name='observation_new'),
|
||||
url(r'^observations/$', views.observations_list, name='observations_list'),
|
||||
url(r'^observations/(?P<id>[0-9]+)/$', views.observation_view, name='observation_view'),
|
||||
url(r'^observations/(?P<id>[0-9]+)/delete/$', views.observation_delete, name='observation_delete'),
|
||||
url(r'^observations/new/$', views.observation_new, name='observation_new'),
|
||||
url(r'^prediction_windows/(?P<sat_id>[\w.@+-]+)/(?P<start_date>.+)/(?P<end_date>.+)/$',
|
||||
'prediction_windows', name='prediction_windows'),
|
||||
views.prediction_windows, name='prediction_windows'),
|
||||
|
||||
# Stations
|
||||
url(r'^stations/$', 'stations_list', name='stations_list'),
|
||||
url(r'^stations/(?P<id>[0-9]+)/$', 'station_view', name='station_view'),
|
||||
url(r'^stations/(?P<id>[0-9]+)/delete/$', 'station_delete', name='station_delete'),
|
||||
url(r'^stations/edit/$', 'station_edit', name='station_edit'),
|
||||
url(r'^stations_all/$', StationAllView.as_view({'get': 'list'}), name='stations_all'),
|
||||
|
||||
)
|
||||
url(r'^stations/$', views.stations_list, name='stations_list'),
|
||||
url(r'^stations/(?P<id>[0-9]+)/$', views.station_view, name='station_view'),
|
||||
url(r'^stations/(?P<id>[0-9]+)/delete/$', views.station_delete, name='station_delete'),
|
||||
url(r'^stations/edit/$', views.station_edit, name='station_edit'),
|
||||
url(r'^stations_all/$', views.StationAllView.as_view({'get': 'list'}), name='stations_all'),
|
||||
], 'base')
|
||||
|
|
|
@ -65,28 +65,32 @@ USE_L10N = False
|
|||
USE_TZ = True
|
||||
|
||||
# Templates
|
||||
TEMPLATE_CONTEXT_PROCESSORS = (
|
||||
'django.contrib.auth.context_processors.auth',
|
||||
'django.core.context_processors.debug',
|
||||
'django.core.context_processors.i18n',
|
||||
'django.core.context_processors.media',
|
||||
'django.core.context_processors.static',
|
||||
'django.core.context_processors.tz',
|
||||
'django.contrib.messages.context_processors.messages',
|
||||
'django.core.context_processors.request',
|
||||
TEMPLATES = [
|
||||
{
|
||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||
'DIRS': [path.join(BASE_DIR, 'templates')],
|
||||
'OPTIONS': {
|
||||
'debug': False,
|
||||
'context_processors': [
|
||||
'django.contrib.auth.context_processors.auth',
|
||||
'django.template.context_processors.debug',
|
||||
'django.template.context_processors.i18n',
|
||||
'django.template.context_processors.media',
|
||||
'django.template.context_processors.static',
|
||||
'django.template.context_processors.tz',
|
||||
'django.contrib.messages.context_processors.messages',
|
||||
'django.template.context_processors.request',
|
||||
'network.base.context_processors.analytics',
|
||||
'network.base.context_processors.stage_notice',
|
||||
],
|
||||
'loaders': [
|
||||
'django.template.loaders.filesystem.Loader',
|
||||
'django.template.loaders.app_directories.Loader',
|
||||
],
|
||||
},
|
||||
|
||||
'allauth.account.context_processors.account',
|
||||
|
||||
'network.base.context_processors.analytics',
|
||||
'network.base.context_processors.stage_notice',
|
||||
)
|
||||
TEMPLATE_DIRS = (
|
||||
path.join(BASE_DIR, 'templates'),
|
||||
)
|
||||
TEMPLATE_LOADERS = (
|
||||
'django.template.loaders.filesystem.Loader',
|
||||
'django.template.loaders.app_directories.Loader',
|
||||
)
|
||||
},
|
||||
]
|
||||
|
||||
# Static & Media
|
||||
STATIC_ROOT = path.join(path.dirname(BASE_DIR), 'staticfiles')
|
||||
|
|
|
@ -4,7 +4,6 @@ ENVIRONMENT = 'dev'
|
|||
|
||||
# Debug
|
||||
DEBUG = True
|
||||
TEMPLATE_DEBUG = DEBUG
|
||||
MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
|
||||
'debug_toolbar.middleware.DebugToolbarMiddleware',
|
||||
)
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% block head_title %} - Email{% endblock %}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load account %}
|
||||
|
||||
{% block head_title %} - Confirm E-mail Address{% endblock %}
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load account %}
|
||||
{% load url from future %}
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% block head_title %} - Sign In{% endblock %}
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
|
||||
{% block head_title %} - Sign Out{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% block head_title %} - Change Password{% endblock %}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% block head_title %} - Change Password{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% block title %} - Sign Up{% endblock title %}
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
|
||||
{% block head_title %} - Invitation only Sign Ups{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
|
||||
{% block head_title %} - Verify Your E-mail Address{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
{% extends "account/base.html" %}
|
||||
|
||||
{% load url from future %}
|
||||
|
||||
{% block head_title %} - Verify Your E-mail Address{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
|
|
@ -1,31 +1,35 @@
|
|||
from django.conf import settings
|
||||
from django.conf.urls import patterns, include, url
|
||||
|
||||
from django.contrib import admin
|
||||
|
||||
from avatar import urls as avatar_urls
|
||||
from allauth import urls as allauth_urls
|
||||
|
||||
from network.base.urls import base_urlpatterns
|
||||
from network.users.urls import users_urlpatterns
|
||||
from network.api.urls import api_urlpatterns
|
||||
|
||||
handler404 = 'network.base.views.custom_404'
|
||||
handler500 = 'network.base.views.custom_500'
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
|
||||
urlpatterns = [
|
||||
# Base urls
|
||||
url(r'^', include('network.base.urls', namespace='base')),
|
||||
url(r'^', include(base_urlpatterns, namespace='base')),
|
||||
|
||||
url(r'^admin/', include(admin.site.urls)),
|
||||
url(r'^users/', include('network.users.urls', namespace='users')),
|
||||
url(r'^accounts/', include('allauth.urls')),
|
||||
url(r'^avatar/', include('avatar.urls')),
|
||||
url(r'^admin/', admin.site.urls),
|
||||
url(r'^users/', include(users_urlpatterns, namespace='users')),
|
||||
url(r'^accounts/', include(allauth_urls)),
|
||||
url(r'^avatar/', include(avatar_urls)),
|
||||
|
||||
url(r'^api/', include('network.api.urls'))
|
||||
)
|
||||
url(r'^api/', include(api_urlpatterns))
|
||||
]
|
||||
|
||||
"""
|
||||
if settings.DEBUG:
|
||||
urlpatterns += patterns(
|
||||
'',
|
||||
urlpatterns += [
|
||||
url(r'^404/$', handler404),
|
||||
url(r'^500/$', handler500),
|
||||
url(r'^media/(?P<path>.*)$', 'django.views.static.serve',
|
||||
{'document_root': settings.MEDIA_ROOT}),
|
||||
)
|
||||
]
|
||||
"""
|
||||
|
|
|
@ -1,11 +1,9 @@
|
|||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from network.users import views
|
||||
|
||||
urlpatterns = patterns(
|
||||
'network.users.views',
|
||||
|
||||
url(r'^redirect/$', view=views.UserRedirectView.as_view(), name='redirect_user'),
|
||||
url(r'^update/$', view=views.UserUpdateView.as_view(), name='update_user'),
|
||||
url(r'^(?P<username>[\w.@+-]+)/$', 'view_user', name='view_user'),
|
||||
)
|
||||
users_urlpatterns = ([
|
||||
url(r'^redirect/$', views.UserRedirectView.as_view(), name='redirect_user'),
|
||||
url(r'^update/$', views.UserUpdateView.as_view(), name='update_user'),
|
||||
url(r'^(?P<username>[\w.@+-]+)/$', views.view_user, name='view_user'),
|
||||
], 'users')
|
||||
|
|
|
@ -1,30 +1,30 @@
|
|||
# Basic stuff
|
||||
django==1.8.8
|
||||
django-shortuuidfield==0.1.2
|
||||
django_compressor==1.5
|
||||
django==1.9.1
|
||||
django-shortuuidfield==0.1.3
|
||||
django_compressor==2.0
|
||||
|
||||
# Configuration
|
||||
unicode-slugify==0.1.3
|
||||
django-autoslug==1.7.2
|
||||
django-autoslug==1.9.3
|
||||
django_dotenv==1.3.0
|
||||
dj-database-url==0.3.0
|
||||
opbeat==3.0.2
|
||||
opbeat==3.2.1
|
||||
|
||||
# Security
|
||||
django-braces==1.4.0
|
||||
django-braces==1.8.1
|
||||
|
||||
# Images
|
||||
Pillow==2.8.1
|
||||
Pillow==3.1.0
|
||||
|
||||
# Users
|
||||
django-allauth==0.20.0
|
||||
django-avatar==2.1.1
|
||||
django-crispy-forms==1.4.0
|
||||
django-allauth==0.24.1
|
||||
django-avatar==2.2.1
|
||||
django-crispy-forms==1.6.0
|
||||
|
||||
# Astronomy
|
||||
orbit==0.2
|
||||
|
||||
# API
|
||||
djangorestframework==3.1.1
|
||||
Markdown==2.6.1
|
||||
django-filter==0.9.2
|
||||
djangorestframework==3.3.2
|
||||
Markdown==2.6.5
|
||||
django-filter==0.12
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
-r base.txt
|
||||
|
||||
# Debug & Testing
|
||||
django-debug-toolbar==1.3.0
|
||||
sqlparse==0.1.14
|
||||
flake8==2.4.0
|
||||
factory_boy==2.5.1
|
||||
django-debug-toolbar==1.4
|
||||
sqlparse==0.1.18
|
||||
flake8==2.5.1
|
||||
factory_boy==2.6.0
|
||||
|
|
|
@ -2,4 +2,4 @@
|
|||
-r dev.txt
|
||||
|
||||
MySQL-python==1.2.5
|
||||
gunicorn==19.3.0
|
||||
gunicorn==19.4.5
|
||||
|
|
|
@ -2,4 +2,4 @@
|
|||
-r base.txt
|
||||
|
||||
MySQL-python==1.2.5
|
||||
gunicorn==19.3.0
|
||||
gunicorn==19.4.5
|
||||
|
|
Loading…
Reference in New Issue