Rebecca Law 46e0e3fd1b Merge branch 'master' into api-keys-flow ...

Conflicts:
	tests/app/main/views/test_api_keys.py

2016-01-21 15:50:00 +00:00

..

dao

Fixed some tests. Some broken mocked tests commented out until later

2016-01-21 12:31:09 +00:00

notifications

…

views

Merge branch 'master' into api-keys-flow

2016-01-21 15:50:00 +00:00

__init__.py

Move view function into own file, add test

2016-01-16 12:31:01 +00:00

encryption.py

…

forms.py

Added a validator so that the key name is unique per service.

2016-01-21 14:15:36 +00:00

uploader.py

Changed flow to upload directly to s3 if non empty file.

2016-01-14 16:07:06 +00:00

utils.py

Added choose_service using services_dao.

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

validators.py

…