Martyn Inglis e6347d99bd Merge branch 'master' into stats-db-updates ...

Conflicts:
	tests/app/conftest.py

2016-08-03 11:46:40 +01:00

..

accept_invite

…

authentication

Fix bug with expired token error response

2016-07-22 15:10:37 +01:00

aws

…

celery

Statsd timings were being passed a timedelta instead for float for

2016-07-22 12:13:24 +01:00

clients

Moved mmg_url to configs.

2016-07-20 10:40:50 +01:00

dao

Merge branch 'master' into stats-db-updates

2016-08-03 11:46:40 +01:00

events

…

invite

…

job

separated schemas once more into "with template" and "with personalisation"

2016-07-26 14:34:59 +01:00

notifications

separated schemas once more into "with template" and "with personalisation"

2016-07-26 14:34:59 +01:00

notifications_statistics

…

provider_details

…

service

Merge pull request #563 from alphagov/week-agg

2016-08-02 10:27:15 +01:00

spec

dont load template contents for job page

2016-07-26 14:34:59 +01:00

status

…

template

Update utils for Markdown parsing + subbranding

2016-07-22 11:09:23 +01:00

template_statistics

…

user

Make email a required field for the email_data_schema.

2016-07-08 10:57:20 +01:00

__init__.py

Reordered imports

2016-07-29 10:15:34 +01:00

aws_sqs.py

…

commands.py

…

encryption.py

…

errors.py

…

history_meta.py

…

models.py

update notification_history table from notification_dao create/update functions

2016-07-12 13:28:45 +01:00

schemas.py

separated schemas once more into "with template" and "with personalisation"

2016-07-26 14:34:59 +01:00

statsd_decorators.py

Rewiring how we do statsd

2016-08-02 14:23:47 +01:00

utils.py

…

version.py

Fixed config so properties are shared if possible

2016-07-29 10:15:34 +01:00