Rebecca Law 4ba801edab Merge branch 'master' into error-handling ...

Conflicts:
	app/main/views/invites.py

2016-03-10 15:03:21 +00:00

..

dao

Merge branch 'master' into error-handling

2016-03-10 15:03:21 +00:00

notifications

Updated generate_token to use encrypt the entire url.

2016-01-11 15:18:37 +00:00

views

Merge branch 'master' into error-handling

2016-03-10 15:03:21 +00:00

__init__.py

[WIP] Start of user accepting invite.

2016-03-01 14:10:35 +00:00

encryption.py

109526036: Updates as per comments made on pull request.

2015-12-10 15:21:06 +00:00

forms.py

Service name uniqueness handled in all cases and tests passing.

2016-03-10 14:29:31 +00:00

uploader.py

Give the user better error messages for CSV files

2016-03-08 18:36:22 +00:00

validators.py

Working tests, hopefully all code changes done.

2016-01-27 12:22:32 +00:00