David Taylor 178cae409f Fixed GIT merge issues #76

2015-04-22 13:40:20 +01:00

..

migrations

Added api_key database migrations. Also includes other outstanding migrations:

2015-04-20 12:57:42 +01:00

static

Merged in indent-item (pull request #12)

2015-04-21 22:41:29 +01:00

templates/RIGS

Fixed GIT merge issues #76

2015-04-22 13:40:20 +01:00

templatetags

Fixed issue with ordering breaking if there is no order is set in the URL

2014-11-05 14:06:37 +00:00

__init__.py

Initial commit

2014-10-23 21:48:04 +01:00

admin.py

Basic working invoice system. Need to add a way to create invoices.

2015-01-29 23:18:04 +00:00

finance.py

Fix for #9

2015-03-04 15:49:00 +00:00

forms.py

Fixed issue #61 - caused by typo in 0940d9f

2015-04-19 23:40:12 +01:00

ical.py

Change ical to use dynamically generated URL's instead of a static base URL.

2015-04-21 19:25:46 +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

Change ical to use dynamically generated URL's instead of a static base URL.

2015-04-21 19:25:46 +01:00

rigboard.py

Added calendar view

2015-04-19 22:25:59 +01:00

tests.py

Initial commit

2014-10-23 21:48:04 +01:00

urls.py

Merge conflict from master

2015-04-21 19:57:45 +01:00

views.py

Merge conflict from master

2015-04-21 19:57:45 +01:00