darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-06-04 21:40:23 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,748 Commits 56 Branches 60 Tags
5d8147bbbd25136fc2eedc167bcd2eeabb4b5301
Commit Graph

6748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Hill-Scott
b73e42650d Refactor hex colour preview Javascript 
This commit improves the code that previews a hex colour when setting up
or changing an email branding.

Specifically it:
- refactors the Javascript to conform to our patterns (module pattern,
  preprocessed with Gulp)
- makes the code work when there are multiple colour previews on one
  page

It also does some visual prettifying, because I couldn’t help myself…
 2018-08-22 16:31:05 +01:00
Chris Hill-Scott
864e732c38 Merge pull request #2241 from alphagov/add-colours-and-domain-to-email-branding 
New columns for email branding
 2018-08-22 16:29:42 +01:00
Rebecca Law
473c8378fc Created a method to decide which colour to pass into the notifications-utils method to preview the template. 
Removed the ServiceCreateEmailBranding form - it is identical to the other form.
 2018-08-22 12:56:08 +01:00
Chris Hill-Scott
6c8345045f Merge pull request #2245 from alphagov/bump-utils-long-letters 
Bump utils to show error message for long letters
 2018-08-22 09:41:28 +01:00
Chris Hill-Scott
2ca2176f76 Merge pull request #2205 from alphagov/pyup-update-eventlet-0.22.1-to-0.24.1 
Update eventlet to 0.24.1
 2018-08-22 09:36:46 +01:00
Chris Hill-Scott
270a563fea Bump utils to show error message for long letters 
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/518
 2018-08-22 09:32:34 +01:00
Chris Hill-Scott
b2d8937f94 Tweak wording 2018-08-21 15:19:26 +01:00
karlchillmaid
d8f5896f9d Merge pull request #2243 from alphagov/reply-to_address_label_change 
Rename 'reply-to address' in Settings
 2018-08-21 10:23:43 +01:00
Chris Hill-Scott
0b86a12fdd Tell people they can have their logo on letters 
At the moment there’s nothing in Notify that says the logo on letter
templates can be changed from ‘HM Government’. While some people guess
that it’s possible, or are motivated enough to enquire, others might be
assuming that the branding can’t be changed (and thus deciding Notify
letters aren’t for them).

In the future we should make this process slicker (eg with a file
upload) but the easiest, quickest improvement to make for now is:
- let people know that the branding can be changed
- direct them to support if they do want to change it
 2018-08-21 09:56:20 +01:00
Chris Hill-Scott
7530fbf731 Fix the tests and catch a few more examples 2018-08-20 18:05:46 +01:00
karlchillmaid
36e8a9b3cc Corrected the page title 
Corrected the page title to 'Data retention'
 2018-08-20 16:59:35 +01:00
karlchillmaid
60f64ee5e5 'Email reply-to address' updated 
Updated 'reply-to address' to include a hyphen
 2018-08-20 16:50:56 +01:00
karlchillmaid
e18f1727d1 'Email reply-to addresses' updated 
Updated 'reply-to address' to include a hyphen
 2018-08-20 16:48:21 +01:00
karlchillmaid
2c635faf5f 'Email reply-to address' updated 
Updated 'reply-to address' to include a hyphen
 2018-08-20 16:46:28 +01:00
karlchillmaid
15ed2e624a 'Email reply-to address' updated 
Updated 'reply-to address' to include a hyphen
 2018-08-20 16:45:08 +01:00
karlchillmaid
fb717e6933 'Email reply-to address' updated 
Updated 'reply-to address' to include a hyphen
 2018-08-20 16:43:42 +01:00
karlchillmaid
abed956a5a 'Email reply-to address' label change 
Updated 'reply-to address' to include a hyphen
 2018-08-20 16:41:16 +01:00
Chris Hill-Scott
9e5ce87f58 Update eventlet from 0.22.1 to 0.24.1 2018-08-20 16:12:27 +01:00
Chris Hill-Scott
b8f41d5204 Merge pull request #2218 from alphagov/pyup-update-whitenoise-3.3.1-to-4.0 
Update whitenoise to 4.0
 2018-08-20 16:09:39 +01:00
Rebecca Law
3fda171f80 New columns for email branding 
Added banner_colour, single_id_colour and domain to email branding view. Now able to set the fields.

However, the new fields are not being used yet.
 2018-08-20 13:27:17 +01:00
Chris Hill-Scott
a3139cdb19 Merge pull request #2240 from fidejoseph/patch-1 
Update email_domains.yml
 2018-08-20 13:08:41 +01:00
fidejoseph
3fbe85cdf8 Update email_domains.yml 
update: hscni.net
 2018-08-20 12:14:03 +01:00
Chris Hill-Scott
752d79b89f Merge pull request #2239 from alphagov/pyup-update-pytest-3.7.1-to-3.7.2 
Update pytest to 3.7.2
 2018-08-20 11:28:12 +01:00
Chris Hill-Scott
ba2c9fca5c Merge pull request #2237 from alphagov/pyup-update-pyexcel-io-0.5.7-to-0.5.8 
Update pyexcel-io to 0.5.8
 2018-08-20 11:28:06 +01:00
Chris Hill-Scott
09aacbba0d Freeze requirements 2018-08-20 11:25:31 +01:00
pyup-bot
49b79dc8ac Update whitenoise from 3.3.1 to 4.0 2018-08-20 11:23:12 +01:00
Chris Hill-Scott
a62308b10f Freeze requirements 2018-08-20 10:29:30 +01:00
pyup-bot
6071c98031 Update pyexcel-io from 0.5.7 to 0.5.8 2018-08-20 10:27:24 +01:00
pyup-bot
2a06748a32 Update pytest from 3.7.1 to 3.7.2 2018-08-18 16:46:56 +01:00
Pete Herlihy
b6d56af9d4 Merge pull request #2238 from alphagov/new-domains 
Adding derrystrabane.com (local council)
 2018-08-17 15:35:10 +01:00
Pete Herlihy
bbccbd8784 Adding derrystrabane.com (local council) 
For *reasons* they've gone with dot com addresses.
 2018-08-17 15:12:24 +01:00
Katie Smith
43e3ddb73a Merge pull request #2233 from alphagov/increase-sms-length 
Increase SMS maximum length from 459 to 612
 2018-08-17 14:03:29 +01:00
Katie Smith
a38c8ebf64 Merge pull request #2229 from alphagov/format-platform-admin-numbers 
Improve number formatting on platform-admin page
 2018-08-17 14:03:14 +01:00
Katie Smith
6b5eaf7fff Improve number formatting on platform-admin page 
Minor changes to the number formatting for the `/platform-admin` page to
- Show the complaint percentage to 2 decimal places. (The number of
complaints is often below 0.0% so 1 decimal place isn't useful)
- Format the numbers in the status boxes to use a comma as a thousands
separator.
 2018-08-16 16:57:02 +01:00
Katie Smith
1b6c357dea Use new value of SMS_CHAR_COUNT_LIMIT from utils 
Admin, API and utils were all defining a value for SMS_CHAR_COUNT_LIMIT.
This value has been updated in notifications-utils to allow text
messages to be 4 fragments long and notifications-admin now gets the value of
SMS_CHAR_COUNT_LIMIT from notifications-utils instead of defining it in
config.
 2018-08-16 16:56:32 +01:00
Katie Smith
cdd828da20 Bump utils to version 30.1.0 
Bumped notifications-utils to bring in the new value for
`SMS_CHAR_COUNT_LIMIT`
 2018-08-16 16:56:32 +01:00
Tom Byers
6249f4826b Merge pull request #2235 from alphagov/sort-branding-radios-alphabetically 
Sort branding radios alphabetically
 2018-08-16 16:49:12 +01:00
Alexey Bezhan
3a00574034 Merge pull request #2224 from alphagov/notifications-page-data-retention-period 
Notifications page data retention period
 2018-08-16 13:55:55 +01:00
Tom Byers
f85a9306a6 Move brandings sort into email_branding_client 2018-08-16 13:40:24 +01:00
Leo Hemsted
96dc1966ca Merge pull request #2234 from alphagov/utils-bump 
bump utils
 2018-08-16 11:45:03 +01:00
Katie Smith
01bc16230e Merge pull request #2236 from alphagov/add-lincoln.fire-uk.org 
Adding fire-uk.org to the list of domains
 2018-08-16 10:32:45 +01:00
Katie Smith
abd9e59d3d Merge pull request #2221 from alphagov/pyup-update-beautifulsoup4-4.6.1-to-4.6.3 
Update beautifulsoup4 to 4.6.3
 2018-08-16 10:32:24 +01:00
Pete Herlihy
d5bd220378 Adding fire-uk.org to the list of domains 2018-08-15 16:35:59 +01:00
Tom Byers
bdde98e9ba Add tests for sort order of branding radios 2018-08-15 16:13:28 +01:00
Tom Byers
93d3027d1f Make email_branding_mock results out of order 
It's useful for testing that they will be put into
order in the interface and doesn't break any
existing tests.
 2018-08-15 16:13:28 +01:00
Tom Byers
01089f4d8c Fix test for organisations in brand selection page 
This test was a duplicate of that for branding
showing. This renames them both to better explain
what they do and makes the later one check for
branding styles.

This also removes the
`mock_get_letter_email_branding` param from the
first test as it wasn't being used.
 2018-08-15 16:13:28 +01:00
Tom Byers
853f13c70b Sort email branding selection alphabetically 
For branding combinations in service settings and
branding creation/editing in platform admin.
 2018-08-15 16:13:27 +01:00
Sakis
85ec7a28cb Merge pull request #2231 from alphagov/zipkin-headers 
Both trace_id and span_id headers must be present
 2018-08-15 16:10:09 +01:00
Leo Hemsted
d2f5da317c bump utils 
brings in changes to fix crash in GSM downgrading
 2018-08-15 16:06:50 +01:00
Tom Byers
99e2f481c8 Merge pull request #2232 from alphagov/fix-use-of-brand-name-in-email-preview 
Stop email preview showing brand name
 2018-08-15 14:41:19 +01:00