darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 10:53:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,322 Commits 51 Branches 59 Tags
5fd5544a8c178424d957952bcfd1fd882c4d72bd
Commit Graph

1322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Hill-Scott
5fd5544a8c Use context managers for StringIO 
It’s possible that leaving a StringIO stream open could cause a memory
leak. Using a context manager closes it automatically when it’s finished
with.
 2016-04-04 11:05:17 +01:00
Chris Hill-Scott
33d9a461db Put two rows in example CSV file 
We reckon that this will help people understand that the first row is
headers and the subsequent rows are the users’ data.
 2016-04-04 11:05:17 +01:00
Chris Hill-Scott
a653759bda Merge pull request #371 from alphagov/better-words 
Tweak some wording
 2016-04-04 10:38:08 +01:00
Chris Hill-Scott
7625e184e2 Replace ‘send a batch’ with ‘send from a CSV file’ 
This is better. Not done enough testing to know if it’s the best, but
let’s try it.
 2016-04-04 09:38:14 +01:00
Chris Hill-Scott
95b75d8220 Add a hint to ‘Template name’ text input 
We’ve seen lots of users unsure what the ‘template name’ field is for,
especially on first use. Is it the subject line of the text message?
Will it be who the message comes from? Answer: neither.

So this commit adds a hint to make that clearer.
 2016-04-04 09:35:59 +01:00
Chris Hill-Scott
42cb4b0d99 Remove the verbs from the navigation 
Because ‘Send text messages’ isn’t very helpful if you’re looking to
edit a template.

It also helps front-load the navigation, ie ‘Team’ is the first word,
rather than the more generic ‘Manage’.
 2016-04-04 09:33:29 +01:00
Chris Hill-Scott
5f9605d605 Merge pull request #367 from alphagov/get-started-with-templates 
Make ‘get started’ work for emails and texts
 2016-04-01 09:42:38 +01:00
Chris Hill-Scott
4aebd282ed Merge pull request #368 from alphagov/no-underscores-in-sass-filenames 
Don’t name SASS files with underscores
 2016-04-01 09:42:28 +01:00
Chris Hill-Scott
5fdbacc724 Merge pull request #363 from alphagov/fix-nav-logic 
Fix logic around team on navigation
 2016-04-01 09:42:19 +01:00
Chris Hill-Scott
121a6c83e6 Don’t name SASS files with underscores 
Underscores at the start of filenames are a convention that’s supposed
to tell a preprocessor to ignore a file. Since we’re explicitly
specifying which files need to be preprocessed, this isn’t necessary.

Also, it makes SASS lint throw a warning.
 2016-04-01 08:06:52 +01:00
Chris Hill-Scott
3d9aa931d4 Remove service_dashboard.html 
This template wasn’t being used. It was replaced by
`dashboard/dashboard.html` in b38ae08ad6
 2016-04-01 07:58:23 +01:00
Chris Hill-Scott
d1665e7109 Make ‘get started’ work for emails and texts 
Previously the ‘get started’ block on the dashboard pushed users into
starting with a text message. This led to users writing email content
into a tet message template because it didn’t match their expectations.

Also, the ‘send yourself a test’ link from the dashboard:
- wasn’t much used, because users responded to the similar call to
  action on the choose template page instead
- was confusing if you had created an email template because it
  presupposed that you’d created a text message template

So this commit changes the ‘get started’ block to be a choice between
creating an email template or a text message template. We reckon that
the language of ‘set up’ will help establish that templates are not
equivalent to individual messages. This language is now repeated on the
‘choose template’ page when you don’t have templates as well.
 2016-04-01 07:58:23 +01:00
Rebecca Law
148783023c Merge pull request #366 from alphagov/email_from_uniqueness 
Email from uniqueness
 2016-03-31 16:03:40 +01:00
Rebecca Law
6394408228 Merge branch 'master' into email_from_uniqueness 2016-03-31 15:20:45 +01:00
Rebecca Law
9a2cb60f5e Update the service name validation in the ServiceNameForm and AddServiceForm to check the email_safe version 
of the name against a list of all service email_from fields.
Update find_all_service_names to find_all_service_email_from, which returns the email_from of all services.
 2016-03-31 15:17:05 +01:00
Martyn Inglis
51baa4a210 Adding docs folder 2016-03-31 15:02:44 +01:00
Adam Shimali
559a62889a Merge pull request #361 from alphagov/remove-flash-messages-from-invite 
Removed some un needed flash messages raised as bugs.
 2016-03-31 10:32:12 +01:00
Rebecca Law
1871243cc8 Check the uniqueness of the service name ignoring case. 
When the service name changes the email_from changes to.
Renamed find_all_service_names to find_all_service_names_lower.
 2016-03-31 10:26:03 +01:00
Adam Shimali
3f57aa917c Updated from git comments 2016-03-31 10:23:13 +01:00
Adam Shimali
5346367866 updated mock expectations 2016-03-31 10:14:49 +01:00
Chris Hill-Scott
71bc1e616a Fix logic around team on navigation 
In the navigation you should see either:
- manage team
- view team members

This depends on which permissions you have. You shouldn’t see both at
once. There was a bug which meant you could see both. This commit fixes
that bug.

https://www.pivotaltracker.com/story/show/116608291
 2016-03-31 09:49:09 +01:00
Adam Shimali
fc01735d70 Removed some un needed flash messages raised as bugs. 
In the process found a couple of edge cases of incorrect
use of invitation links by other users which are now
handled.
 2016-03-31 09:44:01 +01:00
Rebecca Law
ab50ed6368 Merge branch 'master' into email_from_uniqueness 2016-03-31 08:37:11 +01:00
Rebecca Law
8391af9d40 Merge pull request #362 from alphagov/fix-bad-permission 
Fix bug with creating the invited user permission list.
 2016-03-30 17:56:01 +01:00
Rebecca Law
0c58d73914 Sort permissions. 2016-03-30 17:50:32 +01:00
Rebecca Law
c4b65d6af9 Fix bug with creating the invited user permission list. 2016-03-30 17:39:19 +01:00
Chris Hill-Scott
4f00ea6965 Merge pull request #360 from alphagov/tidy-footer-link 
Tidied up the footer to put the about links in the right place
 2016-03-30 17:29:32 +01:00
Rebecca Law
677237ba47 Update email_from when the service name is changed. 
Update unit tests
Service name is uniqueness is not based on case.
 2016-03-30 17:12:00 +01:00
Pete Herlihy
8b05f2c080 Tidied up the footer to put the about links in the right place 2016-03-30 15:47:00 +01:00
NIcholas Staples
9de80d685a Merge pull request #359 from alphagov/fix_sent_today_bug 
Fix sent today bug and removed unused file.
 2016-03-30 12:16:55 +01:00
Nicholas Staples
0b2eeb19c5 Fix sent today bug and removed unused file. 
Code quality fix.
 2016-03-30 12:12:31 +01:00
Rebecca Law
f3507af006 Merge pull request #358 from alphagov/fix-permissions 
Add view_activity permissions
 2016-03-30 11:36:49 +01:00
Rebecca Law
e67bb5f716 Fix main_nav for platform admin 
Renamed or_ to any_
 2016-03-30 11:30:18 +01:00
Chris Hill-Scott
d8d8584f70 Merge pull request #355 from alphagov/align-heading-on-pages-with-grid 
Visually align headings inside grid rows
 2016-03-30 11:10:05 +01:00
Rebecca Law
953f2a2245 Add comment to describe view_activity 2016-03-30 10:57:03 +01:00
NIcholas Staples
6960751223 Merge pull request #353 from alphagov/remove_template_dao 
Removed template_dao file and replaced with straight use of the servi…
 2016-03-30 10:54:00 +01:00
Rebecca Law
542d0f939e Add comment when adding the view_activity permission as a default. 
Refactor client.login method so that we can start to migrate to one way to login for unit tests.
 2016-03-30 10:53:15 +01:00
Rebecca Law
c99df69025 Merge branch 'master' into fix-permissions 
Conflicts:
	app/main/views/jobs.py
	tests/app/main/views/test_manage_users.py
 2016-03-30 10:36:55 +01:00
Nicholas Staples
ff9d3d72ad Fixed merge conflicts with master. 
Code quality fixes.
 2016-03-30 10:26:01 +01:00
NIcholas Staples
1a8d4fda69 Merge pull request #357 from alphagov/remove_user_dao 
Merged with master.
 2016-03-30 10:16:09 +01:00
Nicholas Staples
48daac7b94 Merging conflict with two_factor.py 
Fixed merge mistake with two_factor.py.
 2016-03-30 10:11:06 +01:00
NIcholas Staples
62ca57a5de Merge pull request #351 from alphagov/remove_service_dao 
service_dao file has been removed and replaced with just using the se…
 2016-03-30 09:52:06 +01:00
Rebecca Law
1cfaeec7b2 Merge branch 'master' into fix-permissions 2016-03-30 09:32:24 +01:00
Rebecca Law
eb72c6e5bf Refactor unit test 2016-03-30 09:31:53 +01:00
Rebecca Law
017baca5e5 Add proper mocks for the test. 
Updated the localhost in the environment_test file so that if the tests fail if a mock is missing.
 2016-03-30 08:41:07 +01:00
Nicholas Staples
6ad7be9083 Fix test. 2016-03-29 22:50:51 +01:00
Nicholas Staples
644336b151 Merge with master. 2016-03-29 22:50:40 +01:00
Rebecca Law
a4629a290a Add view_activity to decorator. 2016-03-29 17:46:53 +01:00
Rebecca Law
99bd94799e Remove access_developer_docs permission, it doesn't make sense to need it. 
Add view_activity permission when the permissions are being editted.
 2016-03-29 17:33:12 +01:00
Adam Shimali
3e16fc1962 Merge pull request #356 from alphagov/back-after-send-bug 
After send sms or email to self or batch back button bug
 2016-03-29 17:04:54 +01:00