David Taylor 7ac9eef7a2 Merge master into python-deps ...

# Conflicts:
#	PyRIGS/settings.py
#	RIGS/admin.py
#	RIGS/models.py
#	RIGS/test_functional.py
#	RIGS/urls.py
#	requirements.txt
#	wercker.yml

2017-05-10 17:32:21 +01:00

..

management

Heroku Staging Setup (#250)

2016-07-13 23:19:31 +01:00

migrations

Migrate VAT rate to use a single date field rather than datetime.

2016-03-31 13:15:53 +01:00

static

Fix tailing line breaks

2016-10-11 18:47:13 +01:00

templates/RIGS

Make forum go to actual forum

2017-02-06 15:35:29 +00:00

templatetags

Fix import error changed in Django 1.8

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

__init__.py

…

admin.py

Merge master into python-deps

2017-05-10 17:32:21 +01:00

finance.py

Change invoice filename format

2017-03-28 16:58:06 +01:00

forms.py

Fix issues with python2 imports

2016-03-31 12:07:07 +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 master into python-deps

2017-05-10 17:32:21 +01:00

regbackend.py

Change adding extra user data to on a signal instead.

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

rigboard.py

Explicitly define height in oembed JSON

2017-03-10 15:26:00 +00:00

test_functional.py

Merge master into python-deps

2017-05-10 17:32:21 +01:00

test_models.py

Set wercker up to use postgres for tests again.

2016-03-31 16:03:07 +01:00

test_unit.py

Added test for cookie warning

2016-10-09 10:36:30 +01:00

urls.py

Merge master into python-deps

2017-05-10 17:32:21 +01:00

versioning.py

Fix for versioning when event has been deleted, closes #226

2016-04-27 20:49:42 +01:00

views.py

Added cookie check with nice error message

2016-10-09 10:32:58 +01:00