2414 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andras Ferencz-Szabo	3dad024fae	Merge pull request #915 from alphagov/jenkins_coveralls ... Finish coveralls task	2016-08-30 14:45:40 +01:00
bandesz	69180b2d47	Finish coveralls task	2016-08-30 12:06:21 +01:00
minglis	1651c72b3d	Merge pull request #912 from alphagov/fix-dashboard-page ... Fix dashboard page	2016-08-30 11:00:29 +01:00
minglis	69df08e0d0	Merge pull request #913 from alphagov/remove-travis ... Removed travis build	2016-08-26 15:58:32 +01:00
Chris Hill-Scott	8ff70f0814	Merge pull request #904 from alphagov/make-settings-page-a-table ... Make settings page a table and do a better job of explaining the reply to address/text message sender	2016-08-26 15:49:49 +01:00
Martyn Inglis	9a97da93ba	Removed travis build	2016-08-26 15:34:45 +01:00
Martyn Inglis	fc3af8b56e	Extra test for the zero stats case	2016-08-26 15:27:04 +01:00
Chris Hill-Scott	8d8f6bd794	Merge pull request #911 from alphagov/sms-sender-job-page ... Optionally prefix text message on job page	2016-08-26 15:26:15 +01:00
Martyn Inglis	8c159da3ea	Fix for admin app to show job data on dashboard page ... - uses the new stats block in the API to build the stats expected by the dashboard page - all work done in client	2016-08-26 15:21:10 +01:00
Chris Hill-Scott	e6fd8faa02	Optionally prefix text message on job page ... Missed this as part of #905	2016-08-26 15:20:06 +01:00
Chris Hill-Scott	01ac70f6a0	Merge pull request #905 from alphagov/sms-sender-no-prefix ... Don’t prefix text messages is sender name is set	2016-08-26 15:10:34 +01:00
Chris Hill-Scott	c745422578	Don’t prefix text messages is sender name is set ... Implements: - [x] alphagov/notifications-utils#66	2016-08-26 14:45:26 +01:00
Leo Hemsted	4fbd23d5e9	Merge pull request #907 from alphagov/plat-admin ... Platform admin stats rework	2016-08-26 13:51:36 +01:00
bandesz	cf34aff673	Travis cleanup: remove deploy + functest trigger	2016-08-25 16:20:17 +01:00
minglis	9a60cf49a4	Merge pull request #899 from alphagov/handle-new-jobs-api ... Handle new jobs api	2016-08-25 09:56:30 +01:00
Martyn Inglis	c61199d17d	Rewrote some slighlt over complicated logic	2016-08-25 09:15:55 +01:00
Leo Hemsted	6ad7b019ea	added tests for reworked platform admin page	2016-08-24 17:39:20 +01:00
Leo Hemsted	b983f020ff	remove old statistics_api_client ... now unused - replaced mock fn with detailed_services too	2016-08-24 16:26:08 +01:00
Andras Ferencz-Szabo	ae3c4fe1fc	Merge pull request #906 from alphagov/env_rename ... Rename development env to preview	2016-08-24 15:59:42 +01:00
bandesz	ca8ad56be9	Rename development env to preview	2016-08-24 15:55:54 +01:00
Chris Hill-Scott	82b5cc6fc6	Remove 3/4 width column on settings pages ... The mesaure on these pages was too short, making them awkward to read. Also varies the size of text boxes to make them appropriate to the expected size of content that they will contain.	2016-08-24 15:31:49 +01:00
Chris Hill-Scott	09d4ff44bb	Make back button text consistent	2016-08-24 15:26:04 +01:00
Chris Hill-Scott	58b2a8a825	Make email branding settings a table ... So that it matches the other settings on this page	2016-08-24 15:26:04 +01:00
Chris Hill-Scott	e234ed9741	Make live and research mode switches into buttons ... They change state, so they should be buttons (even if they’re still links).	2016-08-24 15:26:04 +01:00
Chris Hill-Scott	c5c693ef0b	Add some explaining to the SMS sender page	2016-08-24 15:26:03 +01:00
Chris Hill-Scott	709882065f	Add some explaining to the email reply to page	2016-08-24 15:26:03 +01:00
Chris Hill-Scott	8eb2dadaa6	Add spacing, balance type size	2016-08-24 15:20:07 +01:00
Chris Hill-Scott	3b3245adbd	Explain trial mode on the settings page ... The previous text on this page around trial mode was a bit of a mouthful. Also it only really made sense if you already knew what trial mode was. This commit tries to make it really explicit: - that you’re in trial mode - what it means to be in trial mode (copied from the trial mode page) - where you go to not be in trial mode	2016-08-24 15:16:13 +01:00
Chris Hill-Scott	05a493f1e8	Remove ‘suspend API keys’ ... This was an early reckon feature. There were a few of problems with it: - it worked on the service, not just on the API keys as described - it was back to front, ‘suspending’ a service set `active` to `True`, reactivating it set `active` to `False` - no part of the API actually respected the `active` flag on a service The same intent can be acheived by either: - revoking an API key - having a platform admin put your service back into trial mode So this commit removes the link and the code behind it.	2016-08-24 15:12:00 +01:00
Chris Hill-Scott	036f2a8880	Allow text_fields to have an optional status ... Status is used for making the text greyed-out or red, etc.	2016-08-24 15:09:36 +01:00
Chris Hill-Scott	fc93d9ff52	Add an ‘edit’ field type ... Like the link field, but right aligns so that it sits nicely in the last column of a table.	2016-08-24 15:09:05 +01:00
Chris Hill-Scott	f84e8e2519	Remove flash messages when changing settings ... Since we’re playing back the values in the table there’s no need to give confirmation of the new value in a flash message.	2016-08-24 15:08:27 +01:00
Chris Hill-Scott	3719cdd115	Make settings page a table not a browse list ... There’s no way of seeing what the current settings are for a service without individually going to the pages where you can change them. This commit replaces the list of settings with a table. The table plays back the current value for each setting. This is a pattern that has worked well on various services[1] as well as on our own user profile page. 1. https://designpatterns.hackpad.com/Check-your-answers-page-2DSpTH9J0wU	2016-08-24 15:04:56 +01:00
Chris Hill-Scott	1691c1a821	Make page <title> match navigation and <h1>	2016-08-24 15:04:16 +01:00
Leo Hemsted	7864f9455d	rewrite platform-admin page to use new non-stats endpoints ... had to change because format from api is slightly different	2016-08-24 15:04:03 +01:00
Chris Hill-Scott	0252a1792a	Split platform admin settings into new section ... Makes it clearer what a normal user can change and what a platform admin can change.	2016-08-24 15:02:52 +01:00
minglis	bcfe2a90e1	Merge pull request #885 from alphagov/new-api-for-deleting-templates ... Using new endpoint for template statistics	2016-08-24 12:42:40 +01:00
Martyn Inglis	d56c14e147	Actually use the right exception class. ... Two HTTPError classes exist. Need to use the one in notifications_python_client.	2016-08-24 12:12:19 +01:00
Martyn Inglis	d149a9691a	Added tests for the 2 use cases: ... used templates unused templates	2016-08-24 12:09:38 +01:00
Martyn Inglis	0b95a30e2f	Raise the exception if not a 404	2016-08-24 11:26:34 +01:00
Martyn Inglis	6e3759eb1f	Merge branch 'master' into new-api-for-deleting-templates ... Conflicts: app/main/views/templates.py	2016-08-24 11:05:19 +01:00
Martyn Inglis	9b348880ef	Test for old style stats - make sure we don't override / fail if no new block present.	2016-08-24 10:42:57 +01:00
Martyn Inglis	5b2ae43d5d	Wrote some tests around the stats conversions. ... Properly named the finished parameter. Handled the root JSON key	2016-08-24 10:35:04 +01:00
Martyn Inglis	b5de1dae5e	Merge branch 'master' into handle-new-jobs-api	2016-08-23 16:59:28 +01:00
Martyn Inglis	4a551329c5	Parse the JOB API response converting new style response to old style object ... - allows migration of API	2016-08-23 16:58:50 +01:00
Andras Ferencz-Szabo	8b99f484d4	Merge pull request #898 from alphagov/jenkins_deploy_stage ... Disable Travis deploys for staging	2016-08-23 16:56:21 +01:00
bandesz	62605a2ed5	Disable Travis deploys for staging	2016-08-23 16:45:40 +01:00
Chris Hill-Scott	cd091af9e7	Merge pull request #894 from alphagov/fix-research-mode-toggle ... Fix admin app putting service into research mode	2016-08-23 14:27:02 +01:00
Andras Ferencz-Szabo	204823a45f	Merge pull request #897 from alphagov/jenkins_deploy_dev ... Fix version file generation, remove master deploys from travis	2016-08-23 14:07:40 +01:00
bandesz	d7324136ae	Fix version file generation, remove master deploys from travis	2016-08-23 13:44:20 +01:00