David Taylor f8aaf9f36e Merge branch 'master' into feature/online-auth ...

# Conflicts:
#	RIGS/rigboard.py
#	RIGS/test_functional.py
#	RIGS/urls.py
#	requirements.txt

2017-05-12 20:53:00 +01:00

..

management

Fix some issues caused by changes made over the last year

2017-05-10 17:51:55 +01:00

migrations

Merge branch 'master' into feature/online-auth

2017-05-12 20:53:00 +01:00

static

Fix order of importing bootstrap variables.

2017-05-09 18:48:03 +01:00

templates/RIGS

Merge branch 'master' into feature/online-auth

2017-05-12 20:53:00 +01:00

templatetags

Fix import error changed in Django 1.8

2015-05-28 22:28:01 +01:00

__init__.py

Add success notification emails.

2017-04-10 19:16:45 +01:00

admin.py

Fix deprecation warnings for django 1.10

2017-05-10 18:30:17 +01:00

apps.py

Add success notification emails.

2017-04-10 19:16:45 +01:00

finance.py

Fix date/time/datetime field types

2017-05-10 23:03:35 +01:00

forms.py

Merge branch 'master' into feature/online-auth

2017-05-12 20:53:00 +01:00

ical.py

Added a day to end dates, if there is no end time (ical and fullcalendar.js use non-inclusive end dates). Issue #154

2015-08-16 21:06:32 +01:00

importer_tests.py

Minor fix for importer adding @nottingham.ac.uk to empty emails.

2015-01-27 16:51:58 +00:00

models.py

Merge branch 'master' into feature/online-auth

2017-05-12 20:53:00 +01:00

regbackend.py

Change adding extra user data to on a signal instead.

2015-05-21 21:45:01 +01:00

rigboard.py

Merge branch 'master' into feature/online-auth

2017-05-12 20:53:00 +01:00

signals.py

Send HTML confirmation emails.

2017-05-09 18:43:27 +01:00

test_functional.py

Merge branch 'master' into feature/online-auth

2017-05-12 20:53:00 +01:00

test_models.py

Merge branch 'master' into feature/online-auth

2017-05-12 20:53:00 +01:00

test_unit.py

Add failing tests for event paperwork printing

2017-05-10 20:25:14 +01:00

urls.py

Merge branch 'master' into feature/online-auth

2017-05-12 20:53:00 +01:00

versioning.py

Update all the things, and fix some upgrade issues

2017-05-10 20:05:36 +01:00

views.py

Fix some issues caused by changes made over the last year

2017-05-10 17:51:55 +01:00