darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-08 04:13:41 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,490 Commits 52 Branches 59 Tags
15fd39043223ce8002f1d7aaffe629cbbe780b97
Commit Graph

2490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bandesz
15fd390432 Add custom static error pages for 413 and some 5xx errors 2016-09-12 16:11:34 +01:00
Chris Hill-Scott
bee9043a4b Merge pull request #937 from alphagov/id-in-table 
Show notification ID in notification table
 2016-09-12 15:39:21 +01:00
Chris Hill-Scott
98dae76a8e Merge pull request #934 from alphagov/update-api-client 
Update Python client
 2016-09-12 15:39:14 +01:00
Chris Hill-Scott
92aacc1a54 Remove extraneous arguments to super 
> dont need self.__class__, self in super - that's a python 2.x crutch.
> super() is equivalent
 2016-09-12 14:59:53 +01:00
Chris Hill-Scott
5fda35c89d Make it clear that client do not use __init__ 
The clients never get passed useful values to their `__init__` methods.
Rather the real values are passed through later using the `init_app`
method.

So it should be an error if the client is relying on the values that
get passed to it’s init method. Easiest way to ensure this is by making
the `__init__` method not expect any arguments and passing fake values
to the `Super` call.
 2016-09-12 12:18:19 +01:00
Leo Hemsted
62868bc014 add test for id appearing in notification table 
use new pytest yield fixture
 2016-09-09 16:30:07 +01:00
Leo Hemsted
c47ce9b26f bump test requirements to most recent 2016-09-09 16:29:30 +01:00
Leo Hemsted
816ba32b25 add id field containg obj id to table if available 
useful for finding out a notification ID when investigating support issues
 2016-09-09 15:50:55 +01:00
Leo Hemsted
30d0944ca1 remove unused notification.html template 2016-09-09 15:50:14 +01:00
Chris Hill-Scott
fa5e5475e9 Update Python client 
Just so that nobody else has to do it.

Implements:
- [x] https://github.com/alphagov/notifications-python-client/pull/29

Which is a breaking change requiring the renaming of method arguments.
 2016-09-08 15:55:07 +01:00
minglis
2ea401213e Merge pull request #928 from alphagov/rationalise-configs 
Simplified the config files for admin.
 2016-09-08 10:27:45 +01:00
Chris Hill-Scott
d46bfaba14 Merge pull request #933 from alphagov/revert-only-show-link-with-permissions 
Revert "Only show ‘Request to go live’ link to admin users"
 2016-09-08 09:49:21 +01:00
Chris Hill-Scott
e29952c4da Revert "Only show ‘Request to go live’ link to admin users" 
This reverts commit 385221cf5b.

The `current_user.has_permissions()` doesn’t seem to work on non-service
pages. Will investigate later.
 2016-09-08 09:46:31 +01:00
Chris Hill-Scott
5176590faf Merge pull request #932 from alphagov/visual-tidy-up 
Visual tidy up
 2016-09-08 09:31:36 +01:00
Martyn Inglis
130698f720 Removed unused route and fixed some formatting 2016-09-08 09:29:08 +01:00
imdadahad
cfbccab1e1 Merge pull request #925 from alphagov/update-readme 
Update README to include additional installation instructions
 2016-09-07 16:05:38 +01:00
Chris Hill-Scott
bafbeac8e6 Merge pull request #930 from alphagov/fix-display-of-jobs-on-dashboard 
Fix empty jobs table showing on dashbord
 2016-09-07 15:25:41 +01:00
Chris Hill-Scott
6f1fa62714 Merge pull request #927 from alphagov/quis-patch-1 
Reword resend email page
 2016-09-07 15:25:33 +01:00
Chris Hill-Scott
ac6b7dd0a0 Tweak spacing on API keys page 
Splits the clients section out a bit more clearly.
 2016-09-07 15:24:15 +01:00
Chris Hill-Scott
bdf5bd51b6 Remove 2/3rds and 3/4 columns 
These columns make the line length too short, and the text less
readable.
 2016-09-07 15:16:52 +01:00
Chris Hill-Scott
93a1f194e9 Remove ‘active’ title on team page 
This section of the page is covered by the ‘Team members’ `<h1>`.

Only the invited users is a special case that needs its own title.
 2016-09-07 15:16:02 +01:00
Chris Hill-Scott
385221cf5b Only show ‘Request to go live’ link to admin users 
Only users with the manage service permission can access this page, so
we should only show the link to users that have this permission.
 2016-09-07 15:14:48 +01:00
Chris Hill-Scott
9cf3854ac6 Merge pull request #929 from alphagov/fix-trial-mode-500 
Fix 500 on trial mode page
 2016-09-07 15:01:49 +01:00
Pete Herlihy
8a714a4e77 Merge pull request #931 from alphagov/dclg-email-domain 
Added dclg ticketing system domain to whitelist for return email
 2016-09-07 14:53:45 +01:00
Pete Herlihy
a7786c1e0b Added dclg ticketing system domain to whitelist for return email 2016-09-07 14:28:49 +01:00
imdadahad
be60e74a21 Merge pull request #926 from alphagov/add-redirect-for-email-verification 
Redirect and resend verification email when pending user attempts to login
 2016-09-07 14:23:56 +01:00
Chris Hill-Scott
9fa99fe007 Fix empty jobs table showing on dashbord 
If you have scheduled and then cancelled jobs this would be enough to
show the jobs block on the dashboard (in otherwords it wasn’t filtering
out cancelled jobs). However the contents of the table _were_ filtering
out cancelled jobs, so the table would be empty and look broken.

This commit changes the conditional to operate on the `list` of jobs
with cancelled ones filtered out.
 2016-09-07 11:13:07 +01:00
Chris Hill-Scott
743377f6b7 Fix 500 on trial mode page 
I was using the trial mode page to prototype the time picker as part of
225a61ddd3.

I didn’t clean up properly, and left an errant undefined variable, which
caused the trial mode page to `500`.

This commit:
- removes the errant argument
- adds a test for all the static pages to make sure that they at least
  return a `200`
 2016-09-07 10:49:57 +01:00
Martyn Inglis
42b04f0565 Merge branch 'master' into rationalise-configs 
Conflicts:
	app/main/views/jobs.py
 2016-09-07 10:34:53 +01:00
Martyn Inglis
b249477953 Simplified the config files for admin. 2016-09-07 10:31:33 +01:00
Chris Hill-Scott
897b89ba6e Make missed content changes on password sent page 
Lose the ‘now‘ like in: https://github.com/alphagov/notifications-admin/pull/877

Lose the ‘we‘ like in: https://github.com/alphagov/notifications-admin/pull/884
 2016-09-06 17:22:27 +01:00
Chris Hill-Scott
93ca29eab8 Merge pull request #922 from alphagov/cancelled-jobs 
Let users cancel a job
 2016-09-06 17:12:19 +01:00
Chris Hill-Scott
9865c2916f Reword resend email page 
Changes the wording to match: 166870c536/app/templates/views/registration-continue.html (L10)

We don’t use ‘we‘.

The ‘in order to‘ bit is unnecessarily verbose.
 2016-09-06 16:59:26 +01:00
Chris Hill-Scott
eb11615a32 Add a cancel job button 
If you schedule a job you might change your mind or circumstances might
change. So you need to be able to cancel it. This commit adds a button
on the job page which hits the `…/cancel` API endpoint for a job.
 2016-09-06 16:55:24 +01:00
Imdad Ahad
91c878a80e Remove flash banner as unncessary 2016-09-06 16:53:53 +01:00
Imdad Ahad
998d33e283 Redirect and resend verification email when pending user attempts to login 2016-09-06 15:44:33 +01:00
Chris Hill-Scott
166870c536 Merge pull request #924 from alphagov/fix-trial-mode-message 
Fix bug where every service was ‘in’ trial mode
 2016-09-06 13:51:14 +01:00
Imdad Ahad
afdf9b7e59 Update README to include additional installation instructions 2016-09-06 10:22:20 +01:00
minglis
f277742492 Merge pull request #910 from alphagov/remove-code-that-handled-old-new-job-api 
Removed check on notifications-sent, that was used to check whether i…
 2016-09-06 10:01:10 +01:00
Chris Hill-Scott
ffdd20351e Fix bug where every service was ‘in’ trial mode 
The message on the service settings page was being shown for every
service, whether or not they were in trial mode. It also tests for both
cases.
 2016-09-05 15:08:18 +01:00
Martyn Inglis
2f56643e3a Fix up issues caused by merge 
- statistics now on job_json
- removed test that validates we handle the case where job has no statistics key - never happens
 2016-09-05 14:45:34 +01:00
Martyn Inglis
1ad2665bfe Merge branch 'master' into remove-code-that-handled-old-new-job-api 
Conflicts:
	app/main/views/jobs.py
	app/notify_client/job_api_client.py
 2016-09-05 14:29:58 +01:00
Martyn Inglis
5f561001eb Merged code from master / fixed conflicts 2016-09-05 13:39:03 +01:00
Martyn Inglis
1732415b45 Fixed formatting issues 2016-09-05 13:38:47 +01:00
Martyn Inglis
380340187b Fixe formatting pep8 issues 2016-09-05 13:38:33 +01:00
Chris Hill-Scott
c94675f457 Don’t show cancelled jobs anywhere 
The information about a job doesn’t make sense if a job is cancelled.

We could change the information to reflect that the job won’t be sent/
wasn’t sent/was cancelled, but there’s nothing you can really do with
this info.

So instead let’s:
- hide cancelled jobs from the dashboard
- hide cancelled jobs from the jobs page
- 404 the page if the user tries to click back enough times to hit the
  job page
 2016-09-02 12:44:36 +01:00
Chris Hill-Scott
fb2db09184 Merge pull request #923 from alphagov/fix-top-keyline-tables 
Fix top keyline on tables with hidden col headings
 2016-09-02 12:15:31 +01:00
Chris Hill-Scott
fc55bdfcee Merge pull request #921 from alphagov/fix-ajax-probs 
Fix problem with AJAX not updating scheduled jobs
 2016-09-02 12:04:11 +01:00
Chris Hill-Scott
3a582b8251 Merge pull request #919 from alphagov/revert-918-catch-missing-statistics 
Revert "Revert "Remove check for statistics not being on job""
 2016-09-02 12:01:05 +01:00
Leo Hemsted
e60763a0f6 Merge pull request #920 from alphagov/junit-test-results 
add junit xml reporting to pytest
 2016-09-02 09:37:58 +01:00