Commit Graph
42 Commits
Author SHA1 Message Date
minglis 183c324f9a Merge pull request #1309 from alphagov/reinstate-new-rate-api
Reinstate new rate api
2017-06-08 14:07:33 +01:00
minglis 834c255195 Fixed typos 2017-06-08 13:55:13 +01:00
minglis e478d2f820 Merge pull request #1298 from alphagov/revert-dashboard-changes
Revert "Merge pull request #1288 from alphagov/add-new-rate-logic"
2017-06-02 10:50:58 +01:00
minglis adbff63d1f Merge pull request #1288 from alphagov/add-new-rate-logic
Wire in the new API method that calculates the total cost and total billable units
2017-06-02 09:52:19 +01:00
minglis 8f70dcf549 Fix typo 2017-06-01 16:55:49 +01:00
minglis 74e79e175b Fix typo 2017-06-01 16:53:36 +01:00
minglis 5d7606f64b Merge pull request #1278 from alphagov/removing-placeholders-non-breaking
Make removing placeholders a non-breaking change
2017-05-18 10:54:23 +01:00
minglis b16e5a2f13 Merge pull request #1276 from alphagov/remove-unused-elements-css
Remove unused Elements SASS
2017-05-18 10:54:01 +01:00
minglis d8fa3497c6 Merge pull request #1280 from alphagov/bump-service-count
Bumped service count
2017-05-18 10:53:25 +01:00
minglis 8b3b1b06eb Merge pull request #1274 from alphagov/48-49
48-49 (and 28-29) for Public Health England
2017-05-18 10:39:57 +01:00
minglis 7bf61507b0 Merge pull request #1263 from alphagov/static-500
make sure static subdir 404s correctly
2017-05-05 09:58:05 +01:00
minglis 5352c81e99 Merge pull request #1244 from alphagov/order-platform-admin-by-activity
Sort platform admin page by requested messages.
2017-04-26 10:23:18 +01:00
minglis afc14d3648 Merge pull request #1241 from alphagov/feat-show-intl-providers-on-page
Show intl providers separately on providers page
2017-04-26 09:56:37 +01:00
minglis 7853817f07 Merge pull request #1071 from alphagov/pentester-as-valid-domain
This PR allows the pentesters to operate as part of white listed root…
2017-01-17 09:01:24 +00:00
minglis 0b0bd54a3e Merge pull request #1056 from alphagov/box-shadow-colour
Fix button shadow colour on product page
2016-12-16 15:19:06 +00:00
minglis 86b4ba6985 Merge pull request #1055 from alphagov/quis-patch-1
Fix misaligned sidebar on the tour
2016-12-16 15:15:54 +00:00
minglis 00564917a6 Merge pull request #1054 from alphagov/ie-product-css-fixes
Fix images on product page in older version of IE
2016-12-16 15:15:42 +00:00
minglis c98a9e89f0 Merge pull request #1053 from alphagov/remove-session-protection
Switched off session protection
2016-12-16 14:31:34 +00:00
minglis 18b4ce919b Merge pull request #1041 from alphagov/add-statsd
Add statsd
2016-12-05 15:59:06 +00:00
minglis 68dc9f1966 Merge pull request #1038 from alphagov/generate-version-file-in-bootstrap
Generate the version file in the bootstrap script
2016-12-02 10:15:07 +00:00
minglis 20d9964f71 Merge pull request #1040 from alphagov/request-id-logging
Request id logging
2016-12-01 13:31:58 +00:00
minglis e056e44aba Merge pull request #951 from alphagov/remove-travis-image
Removed outdated build monitors
2016-09-27 15:29:46 +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
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
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
minglis 9a60cf49a4 Merge pull request #899 from alphagov/handle-new-jobs-api
Handle new jobs api
2016-08-25 09:56:30 +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
minglis 9b389b93b3 Merge pull request #886 from alphagov/handle-new-template-stats-endpoint
For the brief moment when we have incompatible API versions out,
2016-08-23 10:30:06 +01:00
minglis 74c0c3e132 Merge pull request #891 from alphagov/order-by-count-not-template-name
from alphabetical to desc co…
2016-08-23 09:28:21 +01:00
minglis 8195f6c33b Merge pull request #888 from alphagov/merge-fix-for-template-stats
Merged in the defensive code by mistake
2016-08-22 17:32:42 +01:00
minglis 388b8f8e4b Merge pull request #876 from alphagov/use_new_template_stats_endpoint
Use new template stats endpoint
2016-08-22 16:47:59 +01:00
minglis 8a04770c8e Merge pull request #878 from alphagov/handle_api_response
Handle the API migration
2016-08-22 16:30:37 +01:00
minglis b6de6d283c Merge pull request #884 from alphagov/quis-patch-1
Another content change from Gwen
2016-08-22 16:27:40 +01:00
minglis e31b19ea61 Merge pull request #879 from alphagov/more_wording_changes
Changed some more instances of "confirmation" code to "security" code
2016-08-22 13:31:51 +01:00
minglis 351b91fe2e Merge pull request #874 from alphagov/readme-cleanup
Update README.md
2016-08-22 12:38:23 +01:00
minglis 88622f1638 Merge pull request #877 from alphagov/gwen
Make Gwen’s content changes
2016-08-22 12:37:53 +01:00
minglis f6d62e385e Merge pull request #828 from alphagov/new_staging
New staging
2016-08-02 14:48:11 +01:00
minglis 817a52781f Merge pull request #803 from alphagov/remove-stats-from-job-page
Remove stats from job page
2016-07-26 11:24:00 +01:00
minglis 4db855c5b5 Merge pull request #804 from alphagov/too-many-messages
Too many messages
2016-07-26 11:23:55 +01:00
minglis 4c2daddf75 Merge pull request #805 from alphagov/update-util-markdown-branding
Update utils for Markdown parsing + subbranding
2016-07-26 11:23:48 +01:00
minglis 071117cbb1 Merge pull request #771 from alphagov/use-python-3-in-bootstrap
using python3 in falback venv
2016-07-08 14:45:36 +01:00