688 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicholas Staples	f681d40366	Character count added and tests passing. ... Remove sql restriction for count to not be null.	2016-04-15 16:31:13 +01:00
Rebecca Law	966a662513	Merge branch 'master' of github.com:alphagov/notifications-api	2016-04-15 14:51:35 +01:00
Rebecca Law	86104f7e56	Fix deployment group names	2016-04-15 14:51:12 +01:00
Chris Hill-Scott	a6f78ecdbd	Merge pull request #225 from alphagov/unlink-govuk ... Stop GOV.UK becoming a link in email clients	2016-04-15 13:34:06 +01:00
Chris Hill-Scott	02f903b44c	Stop GOV.UK becoming a link in email clients ... Implements (and depends on) https://github.com/alphagov/notifications-utils/pull/24 Works for: - emails we send to users, eg invite, forgot password - email templates that users have created	2016-04-15 12:33:58 +01:00
Rebecca Law	9eb895a98b	Merge pull request #226 from alphagov/simplify-jwt ... Simplify jwt	2016-04-15 12:05:15 +01:00
Rebecca Law	c9761cd58a	remove unused import	2016-04-15 10:59:00 +01:00
Rebecca Law	282a62e636	Use the new version of the notifications-python-client. This version no longer adds the req and pay to the claims of the jwt. ... The change is backward compatible so an older client that sends a jwt with the extra claims will pass authentication. Once all the clients have been updated to not include the extra claims some updates to exclude them from the method signatures will happen as well.	2016-04-14 18:12:33 +01:00
NIcholas Staples	b9ca7c239a	Merge pull request #221 from alphagov/process_email_subject_placeholders ... Working placeholders in subject with upgraded notifications-utils.	2016-04-13 16:04:42 +01:00
Nicholas Staples	1b76646170	Working placeholders in subject with upgraded notifications-utils. ... Fix test.	2016-04-13 15:53:27 +01:00
NIcholas Staples	3c4c9c18dc	Merge pull request #219 from alphagov/fix_delete_successful_bug ... Fixed bug with deleting the 'delivered' notifications.	2016-04-13 12:54:38 +01:00
Nicholas Staples	7fa33a52a9	Fixed bug with deleting the 'delivered' notifications.	2016-04-13 12:49:38 +01:00
Rebecca Law	cf883ed339	Merge pull request #217 from alphagov/update_uuid_all_db_models ... Update uuid all db models	2016-04-13 11:59:40 +01:00
Chris Hill-Scott	19b3a53499	Merge pull request #218 from alphagov/order-templates-updated ... Order templates by last updated date	2016-04-12 15:26:20 +01:00
Chris Hill-Scott	29b9e50952	Order templates by last updated date ... The template you want to send/edit is probably one of the ones you recently sent from or edited. https://www.pivotaltracker.com/story/show/117159263	2016-04-11 17:39:49 +01:00
Nicholas Staples	90f0505a3d	Update limit to message_limit. ... Further db changes and updates. Remove traceback print out. Fix bug in passing template id to a task.	2016-04-11 16:53:40 +01:00
Nicholas Staples	c4b316bde6	Rebased migrations, all tests working.	2016-04-08 13:34:54 +01:00
Rebecca Law	2abdad8d20	Merge pull request #215 from alphagov/fix-configs ... Fix configs	2016-04-08 11:12:04 +01:00
Rebecca Law	14ecc78224	Merge branch 'master' into fix-configs	2016-04-08 11:04:52 +01:00
Rebecca Law	203d9f1e42	Fix mmg_api_key config	2016-04-08 11:04:24 +01:00
Rebecca Law	f17acf6d6c	Merge pull request #212 from alphagov/fix-configs ... Fix bucket name for all environments	2016-04-08 10:40:58 +01:00
Rebecca Law	39f7aa0820	Fix bucket name for all environments	2016-04-08 10:28:25 +01:00
Rebecca Law	33b68d8b57	Merge pull request #206 from alphagov/use-app-hosted-crown ... Use version of crown logo hosted by admin app	2016-04-08 10:13:03 +01:00
Rebecca Law	cb6e7768ab	Merge pull request #211 from alphagov/fix-configs ... Add live and staging config for MMG_API_KEY	2016-04-08 10:12:02 +01:00
Rebecca Law	3813d33e2b	Add live and staging config for MMG_API_KEY	2016-04-08 10:00:06 +01:00
NIcholas Staples	2024469eb7	Merge pull request #209 from alphagov/uploaded_csv_location_change ... Updated to retrieve csv upload from new bucket.	2016-04-07 15:08:21 +01:00
Nicholas Staples	143d1b0db8	Updated to retrieve csv upload from new bucket. ... Fix test errors.	2016-04-07 14:10:30 +01:00
Rebecca Law	74700334e6	Merge pull request #207 from alphagov/integrate_MMG ... Integrate mmg	2016-04-07 10:58:36 +01:00
Rebecca Law	fb04b36cba	Fix **kwargs	2016-04-07 10:53:59 +01:00
Rebecca Law	b4473a2825	Merge branch 'master' into integrate_MMG	2016-04-07 10:44:13 +01:00
Rebecca Law	c132bbf46e	Rename NOTIFY_FROM_NUMBER to MMG_FROM_NUMBER, there should be a separate short code per provider.	2016-04-07 10:18:46 +01:00
Adam Shimali	66e0f225a9	Merge pull request #205 from alphagov/fix-for-stats-window ... Fix for date range required for template stats	2016-04-07 10:01:33 +01:00
Chris Hill-Scott	98c92fa04e	Use version of crown logo hosted by admin app ... Implements and depends on: https://github.com/alphagov/notifications-utils/pull/19 Depends on this admin app deploy: https://github.com/alphagov/notifications-admin/pull/410	2016-04-07 10:01:05 +01:00
Adam Shimali	4ed2e7f8f2	Fix for misunderstanding about date range required for templates ... stats. It should always be last n days, whether or not there is data.	2016-04-07 09:30:02 +01:00
Rebecca Law	340f8ceaf6	Update mmg send_sms to include cid and request headers ... Use mmg to send_sms	2016-04-06 17:35:14 +01:00
Rebecca Law	90194cbbb8	Remove the abstract ClientResponses class. Refactor aws_ses not to require the class. ... All three client now use a response_map for the delivery receipt processing.	2016-04-06 16:34:45 +01:00
Rebecca Law	323b2ff537	Use MMG client for send-sms	2016-04-06 15:56:34 +01:00
Adam Shimali	3912cd95aa	Merge pull request #204 from alphagov/add-timestamp-to-template-stats ... Change sort order for templates	2016-04-06 15:10:59 +01:00
Rebecca Law	e8d5a9292a	Merge branch 'master' into integrate_MMG ... Conflicts: app/notifications/rest.py	2016-04-06 14:58:13 +01:00
Rebecca Law	4806123d5c	Add process_mmg_responses ... Refactor process_firetext_responses Removed the abstract ClientResponses for firetext and mmg. There is a map for each response to handle the status codes sent by each client. Since MMG has about 20 different status code, none of which seem to be a pending state (unlike firetext that has 3 status one for pending - network delay). For MMG status codes, look for 00 as successful, everything else is assumed to be a failure.	2016-04-06 14:31:33 +01:00
Adam Shimali	3057641e40	Change sort order for templates from name to date using full timestamp ... so that it would be most recently used at top.	2016-04-06 14:30:13 +01:00
Chris Hill-Scott	044f2b7896	Merge pull request #203 from alphagov/double-check-restricted-mode ... Catch sending to restricted recipients in Celery	2016-04-06 13:10:45 +01:00
Chris Hill-Scott	a63d6aa168	Add test for sending email while service restricted	2016-04-05 15:27:16 +01:00
Chris Hill-Scott	eef6d80ae2	Catch sending to restricted recipients in Celery ... The Celery `send_sms` and `send_email` tasks _could_ assume that all the recipients it gets are safe, because they have been checked either: - when the admin app processes the CSV - in the `/notifications/sms|email` endpoint *However*, it’s probably safer to make the check again when the Celery task run and passes the message off to the third party. This also means that changing a service _back_ to restricted would have an effect on messages that were queued, as well as all subsequent messages. This commit: - restores the test that was removed here: e56aee5d1d (diff-e5627619e387fccc04783c32a23e6859L346) - adds checks back into the Celery tasks for sending email and SMS, using the `allowed_to_send_to` function that was introduced into utils in https://github.com/alphagov/notifications-utils/pull/16	2016-04-05 15:11:27 +01:00
NIcholas Staples	2e09ead30f	Merge pull request #198 from alphagov/retain_all_notifications_for_7_days ... Successful notifications are deleted after a week now. All tests pass…	2016-04-05 15:05:58 +01:00
NIcholas Staples	0ebfe8f699	Merge pull request #201 from alphagov/remove_csv_after_processing ... Remove csv after process job is finished.	2016-04-05 15:05:24 +01:00
Nicholas Staples	4cc0028b01	Remove csv after process job is finished. ... Fixed new tests.	2016-04-05 14:55:03 +01:00
Rebecca Law	f2ee8f3eb7	WIP	2016-04-05 14:39:59 +01:00
Chris Hill-Scott	cb5151d9be	Merge pull request #199 from alphagov/whitelist-bug-fix ... Fix bug with whitelist	2016-04-05 12:08:56 +01:00
Chris Hill-Scott	7f7c5bc9d3	Fix bug with whitelist ... Implements https://github.com/alphagov/notifications-utils/pull/17	2016-04-05 12:00:31 +01:00