1408 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chris Hill-Scott	2465398e48	Merge branch 'revert-169-tabluar-big-number'	2016-04-08 10:55:22 +01:00
Chris Hill-Scott	32cd312451	Revert "Use tablular numbers for ‘big number’ pattern"	2016-04-08 10:55:21 +01:00
Chris Hill-Scott	814470d7db	Merge branch 'better-error-message-if-accept-invite-but-signed-in'	2016-04-08 10:55:20 +01:00
Chris Hill-Scott	25079464b0	More helpful error when signed in an accept invite	2016-04-08 10:55:20 +01:00
Chris Hill-Scott	f2109b6150	Merge branch 'links-on-trial-mode-page'	2016-04-08 10:55:16 +01:00
Chris Hill-Scott	e560969e34	Add service-specific links to trial mode page ... > Trial mode page – if signed in, make your team into a link to the Team > members page for the last-used service. > Trial mode – if signed in, make remove these restrictions into a link to > the Request to go live page for the last-used service.	2016-04-08 10:55:16 +01:00
Chris Hill-Scott	0cc67205c7	Merge branch 'rename-history'	2016-04-08 10:55:08 +01:00
Chris Hill-Scott	2b9e016d14	‘History’/‘Notifications activity’ → ‘Activity’	2016-04-08 10:55:08 +01:00
NIcholas Staples	ab8a5c561f	Merge pull request #423 from alphagov/fix_environ_config ... Update config. All tests passing.	2016-04-07 17:37:39 +01:00
Nicholas Staples	1c53efec62	Update config. All tests passing.	2016-04-07 17:33:30 +01:00
NIcholas Staples	9d6dfaf50f	Merge pull request #414 from alphagov/upload_csv_into_one_bucket ... Upload csv location updated, all tests passing.	2016-04-07 15:08:11 +01:00
Nicholas Staples	8f8cdabfff	Upload csv location updated, all tests passing.	2016-04-07 12:56:57 +01:00
Adam Shimali	194c56943c	Merge pull request #412 from alphagov/aggregate-template-stats ... Aggregation of template stats in admin app.	2016-04-07 12:10:11 +01:00
NIcholas Staples	a4392456ac	Merge pull request #406 from alphagov/api_500_status_page ... Status page now relies on the api passing else a 500 will be returned.	2016-04-07 12:09:20 +01:00
Chris Hill-Scott	c057739646	Merge pull request #413 from alphagov/code-coverage ... Add code coverage	2016-04-07 11:58:32 +01:00
Chris Hill-Scott	5c4de3d13d	Add code coverage ... - generates a code coverage report - triggers Coveralls on every Travis build - adds a badge to the README	2016-04-07 11:03:27 +01:00
Adam Shimali	d7c59fa8d7	Aggregation of template stats in admin app. ... Individual templates stats items fetched from admin.	2016-04-07 10:55:21 +01:00
Chris Hill-Scott	b5915dc956	Merge pull request #408 from alphagov/host-email-image ... Host image used in email template in app	2016-04-07 09:38:48 +01:00
NIcholas Staples	573efb3d32	Merge pull request #407 from alphagov/fix_uppercase_white_list_bug ... Fix issue with uppercase in the domain name.	2016-04-07 09:35:31 +01:00
Chris Hill-Scott	4585cc179d	Merge pull request #401 from alphagov/hello-you ... Indicate which user is you on manage team	2016-04-07 09:29:32 +01:00
Chris Hill-Scott	66506d18bb	Host image used in email template in app ... Right now the crown logo in email templates is hosted on Github. Github is not a CDN. For now, hosting it in the app is a better solution. At some point we should have a CDN for all assets on the app, which would be even better. https://www.pivotaltracker.com/story/show/116952911	2016-04-07 09:29:05 +01:00
Nicholas Staples	2352b0f80d	Fix issue with uppercase in the domain name.	2016-04-06 16:45:35 +01:00
Nicholas Staples	aa5fd65171	Status page now relies on the api passing else a 500 will be returned.	2016-04-06 16:36:26 +01:00
catherineheywood	2ae33f0179	Add temporary doc content to edit	2016-04-06 15:44:02 +01:00
Adam Shimali	503f8d8cd6	Merge pull request #405 from alphagov/add-date-back-into-template-stats ... Add date field back into template stats	2016-04-06 15:15:44 +01:00
Adam Shimali	2dbf522932	Add date field back into template stats	2016-04-06 15:06:02 +01:00
minglis	91de8c504d	Merge pull request #402 from alphagov/fix-500-email-job ... Fix exception on email job page	2016-04-06 14:10:58 +01:00
Chris Hill-Scott	aa3274440b	Fix exception on email job page ... For email jobs, the template needed to look up the service to work out the email_from and from_name. `service` used to be a variable passed through to the view. Now every veiw gets `current_service` instead. This is a quick fix to make things work.	2016-04-06 14:04:02 +01:00
Chris Hill-Scott	8a68b4aa80	Indicate which user is you on manage team	2016-04-06 13:46:55 +01:00
Chris Hill-Scott	65860c458b	Merge pull request #397 from alphagov/human-readable-phone-numbers ... Make it easier to deal with phone numbers in spreadsheets	2016-04-06 11:44:32 +01:00
Chris Hill-Scott	39e94ac8ec	Add row numbers to tables ... When a table is showing the contents of a CSV file, it should look something like a spreadsheet. The minimally skeuomorphic way to do this is by adding row numbers. This commit doesn’t - make the row numbers monospace (it’s barely noticeable and doesn’t reflect what actual spreadsheets do) - make the first column heading ‘Row’ (again, doesn’t reflect how actual spreadsheets work, and takes up more valuable space)	2016-04-06 11:31:37 +01:00
Chris Hill-Scott	2abc336a0c	Make phone numbers human readable ... - in the example table on the ‘send’ page - in the example CSV files Implements: https://github.com/alphagov/notifications-utils/pull/18	2016-04-06 11:31:37 +01:00
NIcholas Staples	584e63c1f6	Merge pull request #398 from alphagov/fix_email_whitelist_bug ... Fixed email bug and added new exhaustive tests.	2016-04-06 11:07:29 +01:00
Nicholas Staples	f0b604084c	Fixed email bug and added new exhaustive tests.	2016-04-06 11:01:37 +01:00
catherineheywood	1a309a64ff	doc tweak, cut out a few words	2016-04-06 10:12:51 +01:00
catherineheywood	bcad27ed83	Merge pull request #382 from alphagov/docs-tweaks ... Some proposed changes to the docs	2016-04-06 09:07:24 +01:00
Chris Hill-Scott	e85e68bc64	Merge pull request #394 from alphagov/tour-after-invite ... When a user accepts an invite, show them the tour	2016-04-05 16:27:35 +01:00
Chris Hill-Scott	686493ed8f	When a user accepts an invite, show them the tour ... It’s jarring to be sent right into the dashboard. We think the tour makes things less jarring.	2016-04-05 16:21:06 +01:00
Adam Shimali	8351d98289	Merge pull request #387 from alphagov/template-stats-on-dashboard ... Template statistics now surfaced on dashboard.	2016-04-05 14:19:45 +01:00
Adam Shimali	dc7964efd7	Fix service id bug in template. Use current_service instead	2016-04-05 14:12:18 +01:00
Chris Hill-Scott	c5be08380e	Merge pull request #391 from alphagov/fix-hidden-trial-mode-link ... Fix hidden trial mode link	2016-04-05 13:59:42 +01:00
Adam Shimali	eade0ef971	Added test for template stats client. ... Removed date column from recently used templates table.	2016-04-05 13:50:42 +01:00
Chris Hill-Scott	0e22c9b2e0	Fix hidden trial mode link ... This link wasn’t styled, therefore it had, by default, the same colour as its background (blue). This commit explicitly sets it to be white, so it is visible against its background.	2016-04-05 13:44:53 +01:00
Chris Hill-Scott	94987a26c8	Merge pull request #389 from alphagov/fix-broken-links-tour ... Fix broken links on tour pages	2016-04-05 13:30:47 +01:00
Chris Hill-Scott	98ce65b825	Fix broken links on tour pages	2016-04-05 13:24:57 +01:00
Chris Hill-Scott	53883fc162	Merge pull request #384 from alphagov/fix-heading-send-page ... Fix incorrect heading on send page	2016-04-05 12:14:26 +01:00
Chris Hill-Scott	07709ba3c8	Merge pull request #386 from alphagov/whitelist-bug-fix ... Fix bug with whitelist	2016-04-05 12:08:25 +01:00
Chris Hill-Scott	9327f83411	Fix bug with whitelist ... Implements https://github.com/alphagov/notifications-utils/pull/17	2016-04-05 11:59:17 +01:00
Adam Shimali	159fe60c1a	Template statistics now surfaced on dashboard. ... Job list removed. Template statistics retrieved at same time as notification stats.	2016-04-05 11:47:24 +01:00
NIcholas Staples	ff3dd857ec	Merge pull request #385 from alphagov/filter_history_bug ... Bug fixed, links now work. All tests passing.	2016-04-05 11:42:00 +01:00