Merge from master

This commit is contained in:
Tom Price
2015-04-25 18:04:11 +01:00
28 changed files with 3525 additions and 127 deletions

View File

@@ -57,7 +57,7 @@ urlpatterns = patterns('',
name='venue_update'),
# Rigboard
url(r'^rigboard/$', rigboard.RigboardIndex.as_view(), name='rigboard'),
url(r'^rigboard/$', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'),
url(r'^rigboard/calendar/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
url(r'^rigboard/archive/$', RedirectView.as_view(pattern_name='event_archive')),