Merged changes in master.

This commit is contained in:
Ydmir
2016-01-24 00:27:03 +01:00
23 changed files with 889 additions and 382 deletions

View File

@@ -58,6 +58,8 @@ INSTALLED_APPS = (
'hrapplications',
'timerboard',
'srp',
'sigtracker',
'optimer',
'corputils',
)

View File

@@ -171,4 +171,15 @@ urlpatterns = patterns('',
# FLEET FITTINGS
url(r'^fits/$', 'services.views.fleet_fits', name='auth_fleet_fits'),
# Sig Tracker
url(r'^sigtracker/$', 'sigtracker.views.sigtracker_view', name='auth_signature_view'),
url(r'^add_signature/$', 'sigtracker.views.add_signature_view', name='auth_add_signature_view'),
url(r'^remove_signature/(\w+)', 'sigtracker.views.remove_signature', name='auth_remove_signature'),
# Fleet Operations Timers
url(r'^optimer/$', 'optimer.views.optimer_view', name='auth_optimer_view'),
url(r'^add_optimer/$', 'optimer.views.add_optimer_view', name='auth_add_optimer_view'),
url(r'^remove_optimer/(\w+)', 'optimer.views.remove_optimer', name='auth_remove_optimer'),
)