darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-13 01:44:08 -04:00
Code Issues Packages Projects Releases Wiki Activity
10,714 Commits 59 Branches 61 Tags
657bd72d73fb55985b60429c75fa25fe73f0f4ce
Commit Graph

10714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
karlchillmaid
5775ccb5b1 Change callout to inset text 2020-02-06 12:30:22 +00:00
Rebecca Law
94c9886a58 Merge pull request #3288 from alphagov/delete-template-dialog 
Delete template dialog
 2020-02-06 10:58:43 +00:00
Rebecca Law
b242467d77 Change the content for the delete template confirmation dialog. 
As per https://www.pivotaltracker.com/story/show/170796514 we want to make the delete template confirmation dialog box more consistent and clear.
The API has been updated with a new endpoint that only returns the last-used date, this date is more accurate since it goes to the ft_notification_status table, if the notification table is empty.
 2020-02-06 10:16:00 +00:00
Rebecca Law
60dd6bca44 Merge pull request #3287 from alphagov/check-current-user-is_authenticated 
Reorder the methods called in sign out
 2020-02-05 16:29:31 +00:00
Rebecca Law
039628cff7 Reorder the methods called in sign out 
We found another scenario where signing out of the db can cause a 500.
If the user archives their trial mode service, current_service.active = false, then signs out, the current user was being signed out client side first, meaning current_user is now an Anonymous user, next the call to the API is made to log out user on db, all calls to NotifyApiClient `check_inactive_service`, which is only authorised if user is platform_admin, but an AnonymousUser does not have that attribute, so a 500 is raise.
Seemed a bit cleaner to change the User.signout method to rather than the `check_inactive_service` method for current_user.is_authenticated.
 2020-02-05 15:58:15 +00:00
Matt Hobbs
a4a6ad04f7 Merge pull request #3279 from alphagov/image-optimisation 
Image optimisation
 2020-02-05 10:46:42 +00:00
Tom Byers
2bb651865a Remove unused images 
As per @quis's comment:

https://github.com/alphagov/notifications-admin/pull/3279#issuecomment-581902125
 2020-02-05 10:37:57 +00:00
Leo Hemsted
636a702d19 Merge pull request #3286 from alphagov/remove-api-keys 
cleanup
 2020-02-05 10:11:47 +00:00
karlchillmaid
c7983c2396 Update app/templates/views/get-started.html 
Fix b tag

Co-Authored-By: Tom Byers <tombaromba@gmail.com>
 2020-02-05 09:24:59 +00:00
Leo Hemsted
4eeddb40f8 bump reqs 2020-02-04 17:16:58 +00:00
Pea M. Tyczynska
b5723a1aef Merge pull request #3285 from alphagov/uploads-fix-letter-link 
Fix bug where job url type was constructed for letter on uploads page
 2020-02-04 16:26:49 +00:00
Tom Byers
fbff4beef5 Update app/assets/error_pages/5xx.html 
Remove unneeded GOV.UK suffix from page title on error page.

Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
 2020-02-04 16:07:33 +00:00
Tom Byers
0d80a4cc8b Update paas-failwhale/index.html 
Remove unneeded GOV.UK suffix from page title.

Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
 2020-02-04 16:07:17 +00:00
Rebecca Law
143564c7f0 Update message seen when deleting a template. 2020-02-04 16:00:51 +00:00
Pea Tyczynska
9ebd18ea85 Add upload_type property to Job class 2020-02-04 15:36:55 +00:00
Leo Hemsted
5b868ff268 remove api keys from codebase 
these are just used for tests so don't need to look like real api keys.
 2020-02-04 14:44:19 +00:00
Rebecca Law
fd59491d19 Merge pull request #3284 from alphagov/fix-sign-out-bug 
Check if user is authenticated before signing out
 2020-02-04 14:37:08 +00:00
Pea Tyczynska
46292949cd Fix bug where job url type was constructed for letter on uploads page 2020-02-04 14:19:07 +00:00
karlchillmaid
ca5a92c682 Comment out 'Upload your own letters' 
Comment out 'Upload your own letters'  because this feature is not available to all users yet.
 2020-02-04 13:51:43 +00:00
karlchillmaid
92ad395fca Comment out and update content 
Comment out and update content because Upload a letter is not available to all users yet.
 2020-02-04 13:50:29 +00:00
karlchillmaid
5314ba72cc Remove 'Upload a letter' 
Remove 'Upload a letter' from navigation because it's not available to all users yet.
 2020-02-04 13:48:45 +00:00
karlchillmaid
238fcd4652 Fix spacing 2020-02-04 13:45:55 +00:00
karlchillmaid
faf983356e Add status page and email 
Add status page and email instructions to the 5xx error.

These match what we show on the 500 error page.
 2020-02-04 13:44:55 +00:00
Rebecca Law
8a19d9496a Check if user is authenticated before signing out, this will prevent a 500 if the user is an AnonymousUser. 
I ended up creating a new test user and logged_in_client, which isn't really great. But I tried adding a current_session_id to the active user in the test, but that broke all other tests.
I tried setting current_session_id in all the users being tested but that didn't work either. I'd like to come back to fixing the tests and reducing the number of conftest methods in another PR. For now this fixes the bug.
 2020-02-04 12:16:58 +00:00
karlchillmaid
fa8a4ae4c2 Update error description 2020-02-03 17:02:22 +00:00
Tom Byers
f8564ebe0c Make agreed changes to content 
The following changes are still to be decided:
- how to tell userr when the service will be up
  again on the PaaS failwhale page
- contact information for both pages
 2020-02-03 17:02:01 +00:00
Tom Byers
9263bac59e Remove all code targetting IE8 
We've dropped support for IE8 so this isn't
needed. For reference:

https://github.com/alphagov/notifications-admin/pull/3158#pullrequestreview-308447860
 2020-02-03 17:01:54 +00:00
Tom Byers
048f0f3179 Update JavaScripts 2020-02-03 17:01:47 +00:00
Tom Byers
3e31cdbfd2 Update fonts 2020-02-03 17:01:38 +00:00
Tom Byers
88bd14811d Update app/assets/error_pages/5xx.html 2020-02-03 17:01:28 +00:00
Tom Byers
a42eaf4184 Update PaaS Failwhale HTML page 2020-02-03 17:00:57 +00:00
Tom Byers
974826e3e2 Update stylesheets 2020-02-03 17:00:24 +00:00
Tom Byers
340111b187 Update images 2020-02-03 17:00:08 +00:00
Chris Hill-Scott
cceb731596 Rename test to be a more explicit about what it’s testing 
It’s not just that they’re an org user, it’s that they’re also a service user. And the usage page is the special case.
 2020-02-03 16:28:47 +00:00
Leo Hemsted
c8648553eb freeze reqs 2020-02-03 16:13:58 +00:00
karlchillmaid
b37560ebe8 Remove Send messages link 2020-02-03 16:06:32 +00:00
Chris Hill-Scott
b7b9e9747b Add test for org user who is also a service user 
Org users should always be able to see the usage page, even if they
don’t have the `manage_service` permission for the service.
 2020-02-03 16:05:46 +00:00
Rebecca Law
18523587a6 Merge pull request #3282 from alphagov/sign-out-user-server-side 
Ensure that the session is logged out server side, not just client side.
 2020-02-03 15:25:18 +00:00
Rebecca Law
0e1ee504ac - Add unit test for when case when the cookie doesn't match the db. 
- Move code into User.signout method to further encapsulate the code.
 2020-02-03 15:08:55 +00:00
karlchillmaid
fcf1494051 Update links - comment out Send messages 2020-02-03 15:04:48 +00:00
karlchillmaid
b0e539abba Fix </ol> tag 2020-02-03 14:25:28 +00:00
pyup-bot
de5ddf1823 Update notifications-python-client from 5.5.0 to 5.5.1 2020-02-03 13:47:04 +00:00
karlchillmaid
6d4d176039 Edit content 2020-02-03 13:29:58 +00:00
karlchillmaid
76f46e47d7 Update description 2020-02-03 13:26:02 +00:00
karlchillmaid
0d9f5b27cd Update description of clickable link text 
Update description of clickable link text to make it clear we're talking about email. This is because we **do** hide URLs behind clickable link text on web pages.
 2020-02-03 13:22:38 +00:00
karlchillmaid
6341c4adb3 Fix </b> tag 2020-02-03 13:11:41 +00:00
karlchillmaid
d9f9205e78 Add instruction 2020-02-03 13:09:55 +00:00
karlchillmaid
83bcd78e44 Delete 'name' from explanation 2020-02-03 13:05:37 +00:00
karlchillmaid
6843930d48 Update link headings 2020-02-03 13:02:55 +00:00
Chris Hill-Scott
8b9c2b7427 Fix tests 2020-02-03 12:47:42 +00:00