 NIcholas Staples
|
50a81a96a3
|
Merge pull request #670 from alphagov/remove_ajax_calls
Comment out ajax queries to update content on frontend.
|
2016-06-10 14:00:50 +01:00 |
|
|
NIcholas Staples
|
f399e4b240
|
Merge pull request #656 from alphagov/bug_fix_for_tour_back_button
Bug fixed when sending yourself a test the back button links to the c…
|
2016-06-07 15:17:40 +01:00 |
|
|
NIcholas Staples
|
139ce3386d
|
Merge pull request #625 from alphagov/download_all_job_notifications
Job notification download now includes all notifications.
|
2016-05-31 10:49:52 +01:00 |
|
|
NIcholas Staples
|
52f7f826c4
|
Merge pull request #607 from alphagov/download_bug_fix
Fixed download bug for services with api notifications. Re-organised …
|
2016-05-25 09:46:25 +01:00 |
|
|
NIcholas Staples
|
e65a7003a2
|
Merge pull request #601 from alphagov/download_job_notifications
Download csv for job added.
|
2016-05-24 09:23:45 +01:00 |
|
|
NIcholas Staples
|
5bcd2a6378
|
Merge pull request #597 from alphagov/job_row_number
Added in notification row number for job pages.
|
2016-05-20 16:56:08 +01:00 |
|
|
NIcholas Staples
|
d9dda51062
|
Merge pull request #595 from alphagov/template_versions_link_design
Beautify the template version links and template link page.
|
2016-05-20 14:20:28 +01:00 |
|
|
NIcholas Staples
|
cd9c8f06f6
|
Merge pull request #553 from alphagov/update_to_utcnow
Update all dates to use utc, only in the template is it converted to …
|
2016-05-11 12:07:07 +01:00 |
|
|
NIcholas Staples
|
90140e1d47
|
Merge pull request #545 from alphagov/no_permissions_banner_msg_fix
Fix for user with only send permissions.
|
2016-05-09 16:02:24 +01:00 |
|
|
NIcholas Staples
|
6f017506fa
|
Merge pull request #540 from alphagov/update-python-client
Update python client to version 1.0.0
|
2016-05-04 16:30:59 +01:00 |
|
|
NIcholas Staples
|
bd0afce745
|
Merge pull request #527 from alphagov/windows_csv
Only check on csv is the file extension.
|
2016-05-03 12:50:34 +01:00 |
|
|
NIcholas Staples
|
9e94d2382d
|
Merge pull request #532 from alphagov/british_time
Times from api are now formatted to the british time.
|
2016-05-03 11:02:21 +01:00 |
|
|
NIcholas Staples
|
96297d2989
|
Merge pull request #522 from alphagov/sms_msg_limit
Sms msg limit
|
2016-04-29 12:29:45 +01:00 |
|
|
NIcholas Staples
|
c08bccd721
|
Merge pull request #506 from alphagov/reset_failed_login_count
Failed login count set to zero with password reset.
|
2016-04-26 12:30:52 +01:00 |
|
|
NIcholas Staples
|
4f71c40735
|
Merge pull request #466 from alphagov/desktop_feedback
Feedback page added. All tests working.
|
2016-04-20 11:17:55 +01:00 |
|
|
NIcholas Staples
|
49e0a98c2c
|
Merge pull request #473 from alphagov/doc_page_fix
Add encoding to the documentation file.
|
2016-04-20 11:05:59 +01:00 |
|
|
NIcholas Staples
|
cd1351bd06
|
Merge pull request #468 from alphagov/download_csv_all
Functionality added to download all on activity page. All tests passing.
|
2016-04-19 15:46:41 +01:00 |
|
|
NIcholas Staples
|
ddec619913
|
Merge pull request #469 from alphagov/fix_doc_link
Doc file is loaded using current directory of the flask view.
|
2016-04-19 13:40:23 +01:00 |
|
|
NIcholas Staples
|
b85c6c3b1a
|
Merge pull request #455 from alphagov/add_created_by_to_api_calls
Add created_by to all appropriate requests.
|
2016-04-15 11:14:05 +01:00 |
|
|
NIcholas Staples
|
51673e26f4
|
Merge pull request #450 from alphagov/make_service_live
Make service live and revert working, all tests passing.
|
2016-04-14 15:43:09 +01:00 |
|
|
NIcholas Staples
|
c465c0404b
|
Merge pull request #448 from alphagov/fix_template_subject_update_bug
Fixed bug for subject not updating when changed on the edit template …
|
2016-04-14 14:14:47 +01:00 |
|
|
NIcholas Staples
|
8c830c82ed
|
Merge pull request #446 from alphagov/fix_link_bug
Updated notifications_utils version and associated code. Added email …
|
2016-04-14 12:06:55 +01:00 |
|
|
NIcholas Staples
|
7272791c54
|
Merge pull request #442 from alphagov/fix_link_bug
Fix template delete links.
|
2016-04-13 17:01:11 +01:00 |
|
|
NIcholas Staples
|
30e9b76c6d
|
Merge pull request #433 from alphagov/notifications_download_csv
Added download csv option for the notifications page. All tests passing.
|
2016-04-12 14:37:49 +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
|
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
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
NIcholas Staples
|
6992041027
|
Merge pull request #369 from alphagov/remember_last_used_service_in_session
All tests working and home page is now dependent on the service in th…
|
2016-04-04 17:09:37 +01:00 |
|
|
NIcholas Staples
|
f444284580
|
Merge pull request #379 from alphagov/filter_notifications_page
Working functionality for filtering notifications and all tests passing.
|
2016-04-04 16:43:57 +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
|
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 |
|
|
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
|
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 |
|
|
NIcholas Staples
|
faaedb318d
|
Merge pull request #338 from alphagov/service_user_permission
Functionality added to existing endpoint without a user_has_permissio…
|
2016-03-23 14:48:10 +00:00 |
|
|
NIcholas Staples
|
35e093ee34
|
Merge pull request #337 from alphagov/remove_user_from_service
Functionality added and all tests working.
|
2016-03-23 11:03:02 +00:00 |
|
|
NIcholas Staples
|
d3758b53e3
|
Merge pull request #305 from alphagov/api_service_permissions
Api service permissions
|
2016-03-21 09:54:43 +00:00 |
|
|
NIcholas Staples
|
dbe8b5b6ec
|
Merge pull request #304 from alphagov/add_valid_email_regexes
Add valid email regexes
|
2016-03-21 09:54:33 +00:00 |
|
|
NIcholas Staples
|
ef1ec2c9a1
|
Merge pull request #307 from alphagov/fix_for_syntax
Syntax fix
|
2016-03-18 15:42:44 +00:00 |
|
|
NIcholas Staples
|
4782d8ca1f
|
Merge pull request #273 from alphagov/add_service_manager_message
added message if not templates and doesn't have ability to add templa…
|
2016-03-15 15:59:59 +00:00 |
|
|
NIcholas Staples
|
f41e762d98
|
Merge pull request #270 from alphagov/fix-error-styling-invite-page
Fix error message spacing on yes/no pattern
|
2016-03-14 09:43:19 +00:00 |
|
|
NIcholas Staples
|
cf195b3a16
|
Merge pull request #271 from alphagov/remove-dao-layer
Start to remove the dao layer
|
2016-03-14 09:42:22 +00:00 |
|
|
NIcholas Staples
|
bf57124817
|
Merge pull request #272 from alphagov/remove-sender
Remove sender module, code was moved to api.
|
2016-03-14 09:41:06 +00:00 |
|
|
NIcholas Staples
|
8c250a7853
|
Merge pull request #258 from alphagov/handle_duplicate_service_name
Handle duplicate service name
|
2016-03-10 14:55:35 +00:00 |
|
|
NIcholas Staples
|
eeb0c5fdb7
|
Merge pull request #249 from alphagov/permission_route_tests
Permission route tests
|
2016-03-09 14:58:49 +00:00 |
|
|
NIcholas Staples
|
5f28d943a4
|
Merge pull request #236 from alphagov/show-completion-of-job
Show how complete a job is on dashboard
|
2016-03-08 08:55:59 +00:00 |
|
|
NIcholas Staples
|
b78a321d90
|
Merge pull request #238 from alphagov/show-invite-email
Show invite email
|
2016-03-08 08:49:00 +00:00 |
|
|
NIcholas Staples
|
877b59cf05
|
Merge pull request #240 from alphagov/invite-flash-messages
Flash message to confirm invitation accepted and user has been
|
2016-03-08 08:45:54 +00:00 |
|
|
NIcholas Staples
|
0e663e044f
|
Merge pull request #226 from alphagov/real-data-on-job-page
Put real data on job page
|
2016-03-03 14:27:10 +00:00 |
|
|
NIcholas Staples
|
30cc01059b
|
Merge pull request #228 from alphagov/update_permission_name
Fix permission names, all tests passing.
|
2016-03-03 12:19:57 +00:00 |
|
|
NIcholas Staples
|
a9b9927115
|
Merge pull request #222 from alphagov/bootstrap-front-end
Add frontend install and build to bootstrap script
|
2016-03-03 11:03:09 +00:00 |
|
|
NIcholas Staples
|
f0e0006a7c
|
Merge pull request #213 from alphagov/accept-phone-or-email-column
Accept CSVs with 'email address' or 'phone number'
|
2016-03-02 11:27:24 +00:00 |
|
|
NIcholas Staples
|
827de42d3a
|
Merge pull request #208 from alphagov/view-user-invites
Manage user pages now surfaces invited users
|
2016-02-26 15:45:52 +00:00 |
|
|
NIcholas Staples
|
f99b9f4918
|
Merge pull request #207 from alphagov/quis-patch-1
Use correct API endpoint in docs
|
2016-02-26 15:05:20 +00:00 |
|
|
NIcholas Staples
|
ff2a0c3807
|
Merge pull request #204 from alphagov/send-user-invite
[WIP] Invite user form now submits data to api.
|
2016-02-26 13:49:44 +00:00 |
|
|
NIcholas Staples
|
b185b1552d
|
Merge pull request #205 from alphagov/bring-back-sass-lint
Bring back SASS lint
|
2016-02-26 13:48:03 +00:00 |
|
|
NIcholas Staples
|
1adb5e673c
|
Merge pull request #203 from alphagov/s3-mocks
Moto s3 mocks removed
|
2016-02-26 12:19:19 +00:00 |
|
|
NIcholas Staples
|
96e7239064
|
Merge pull request #192 from alphagov/get-user-by-email
Admin uses correct endpoint for getting user by email address.
|
2016-02-23 13:19:55 +00:00 |
|
|
NIcholas Staples
|
38545d728a
|
Merge pull request #190 from alphagov/upload-form-csrf-fix
Fix missing CSRF token on send SMS page
|
2016-02-23 09:22:00 +00:00 |
|
|
NIcholas Staples
|
f761afa76e
|
Merge pull request #182 from alphagov/prefil-placeholders
Prefil placeholders
|
2016-02-19 09:37:08 +00:00 |
|
|
NIcholas Staples
|
b7c226e2a8
|
Merge pull request #179 from alphagov/npm-govuk-template
Install GOV.UK Template with NPM
|
2016-02-17 14:43:12 +00:00 |
|
|
NIcholas Staples
|
23e38bfb6e
|
Merge pull request #177 from alphagov/easier-registration
Make registration and forgot password pages better
|
2016-02-17 11:05:17 +00:00 |
|
|
NIcholas Staples
|
78fe2b463a
|
Merge pull request #176 from alphagov/styleguide-updates
Updates to styleguide
|
2016-02-15 12:00:44 +00:00 |
|
|
NIcholas Staples
|
5928c3bb2c
|
Merge pull request #174 from alphagov/clear-cookie-on-sign-out
Use session.clear() sign-out.
|
2016-02-12 16:01:31 +00:00 |
|
|
NIcholas Staples
|
5fd8ca492d
|
Merge pull request #168 from alphagov/mask-phone-number-jobs-page
Make job page more realistic for demo
|
2016-02-10 12:19:47 +00:00 |
|
|
NIcholas Staples
|
a9064b51b8
|
Merge pull request #169 from alphagov/tabluar-big-number
Use tablular numbers for ‘big number’ pattern
|
2016-02-10 11:21:22 +00:00 |
|
|
NIcholas Staples
|
1e60b7d635
|
Merge pull request #167 from alphagov/remove-test-number
Remove need for TWILIO_TEST_NUMBER
|
2016-02-09 16:11:42 +00:00 |
|
|
NIcholas Staples
|
1880ca3c9e
|
Merge pull request #166 from alphagov/quis-patch-1
Add all the configs
|
2016-02-09 14:14:20 +00:00 |
|
|
NIcholas Staples
|
25f74b79bf
|
Merge pull request #164 from alphagov/swap-3fa-fields
Swap order of fields of three factor page
|
2016-02-09 10:58:23 +00:00 |
|
|
NIcholas Staples
|
52ef4cb83e
|
Merge pull request #163 from alphagov/syntax-highlight-docs
Add syntax highlighting to code examples in docs
|
2016-02-09 10:55:31 +00:00 |
|
|
NIcholas Staples
|
2da67fa78f
|
Merge pull request #162 from alphagov/allow_test_number
Allow test number
|
2016-02-08 16:56:10 +00:00 |
|
|
NIcholas Staples
|
7854617453
|
Merge pull request #155 from alphagov/fixes-to-front-end-patterns
Fixes to front end patterns
|
2016-02-05 11:39:46 +00:00 |
|
|
NIcholas Staples
|
cf08f4ef2a
|
Merge pull request #150 from alphagov/send-text-flow-revised
Send text flow revised
|
2016-02-04 14:57:43 +00:00 |
|
|
NIcholas Staples
|
984e6946ca
|
Merge pull request #152 from alphagov/wider-texts-register
Make textboxes wider on create account
|
2016-02-04 14:57:29 +00:00 |
|
|
NIcholas Staples
|
24cdfd9f64
|
Merge pull request #145 from alphagov/bucket-creation
Bucket creation needed correct region to be set.
|
2016-02-03 09:50:20 +00:00 |
|
|
NIcholas Staples
|
bcd89371fe
|
Merge pull request #143 from alphagov/autofocus-two-factor
Autofocus two factor
|
2016-02-02 16:51:33 +00:00 |
|
|
NIcholas Staples
|
aeb884b9a9
|
Merge pull request #142 from alphagov/clearer-verify-page
Clearer verify page
|
2016-02-02 16:51:20 +00:00 |
|
|
NIcholas Staples
|
1f1355547f
|
Merge pull request #133 from alphagov/tidy-up-inconsistent-forms
Tidy up inconsistent forms
|
2016-02-01 17:03:36 +00:00 |
|
|
NIcholas Staples
|
f0f6a3a8cd
|
Merge pull request #132 from alphagov/colours-per-environment
Use different colours for each environment
|
2016-02-01 17:03:24 +00:00 |
|
|
NIcholas Staples
|
674e40d8d4
|
Merge pull request #129 from alphagov/set-template-with-csv
Pass selected template id to api when creating job.
|
2016-02-01 11:43:20 +00:00 |
|
|
NIcholas Staples
|
fa34dcd3a6
|
Merge pull request #128 from alphagov/view-job
List and individual job pages now fetch data from api.
|
2016-01-29 15:57:37 +00:00 |
|
|
NIcholas Staples
|
5f7b9fed3a
|
Merge pull request #126 from alphagov/better-bucket-name
Better bucket name pending possible change to uuid for service primary
|
2016-01-29 12:53:06 +00:00 |
|
|
NIcholas Staples
|
0dc6f7be1a
|
Merge pull request #124 from alphagov/create-job
Uploading csv creates job via api
|
2016-01-29 11:27:26 +00:00 |
|
|
NIcholas Staples
|
6f0d74247d
|
Merge pull request #125 from alphagov/set-service-name-on-session
Set service name on session
|
2016-01-29 11:16:57 +00:00 |
|
|
NIcholas Staples
|
f2a01c50de
|
Merge pull request #121 from alphagov/user-cleanup
Inherit from flask usermixin for default implementation of
|
2016-01-28 15:42:41 +00:00 |
|
|
NIcholas Staples
|
9ecff136d0
|
Merge pull request #120 from alphagov/set-secure-cookie
Set secure cookie
|
2016-01-28 15:42:25 +00:00 |
|
|
NIcholas Staples
|
32de812e6d
|
Merge pull request #118 from alphagov/fix-user-urls
Call to client for password check incorrectly passed user instead
|
2016-01-28 12:41:37 +00:00 |
|
|
NIcholas Staples
|
816aecd8fd
|
Merge pull request #116 from alphagov/add-banner-import
Add import for banner
|
2016-01-27 17:47:23 +00:00 |
|
|
NIcholas Staples
|
68891d8eb8
|
Merge pull request #112 from alphagov/post-hack-day
Show all links in side navigation again
|
2016-01-27 12:25:00 +00:00 |
|
|
NIcholas Staples
|
8ff5ee9ffb
|
Merge pull request #113 from alphagov/real-templates
Use real templates when sending text messages
|
2016-01-27 12:24:52 +00:00 |
|
|
NIcholas Staples
|
0858cec438
|
Merge pull request #114 from alphagov/no-service-hint
Remove hint from choose service page
|
2016-01-27 12:24:44 +00:00 |
|
|
NIcholas Staples
|
14c49eaac1
|
Merge pull request #115 from alphagov/temporarily-suspend
Show correct default state on service settings page
|
2016-01-27 12:24:35 +00:00 |
|
|
NIcholas Staples
|
54a322bb7a
|
Merge pull request #111 from alphagov/sign-in-cleanup
Incrementing of failed logins happens on api side
|
2016-01-26 12:44:12 +00:00 |
|
|
NIcholas Staples
|
d89174f322
|
Merge pull request #108 from alphagov/test-cleanup
Test cleanup
|
2016-01-26 10:53:49 +00:00 |
|
|
NIcholas Staples
|
b0acbb3497
|
Merge pull request #109 from alphagov/add-test-for-template-repopulation
Add test for template page repopulation
|
2016-01-26 10:53:27 +00:00 |
|
|
NIcholas Staples
|
f11f50b4a5
|
Merge pull request #105 from alphagov/fix-get-services
Able to get services by user id
|
2016-01-22 16:56:06 +00:00 |
|
|
NIcholas Staples
|
44cb480375
|
Merge pull request #104 from alphagov/session-expiry
Sessions expire after one hour
|
2016-01-22 15:13:46 +00:00 |
|
|
NIcholas Staples
|
820e78409f
|
Merge pull request #103 from alphagov/visual-tweaks
Various fixes
|
2016-01-22 14:58:44 +00:00 |
|