Commit Graph

1350 Commits

Author SHA1 Message Date
David Taylor
6370679b62 Initial proof of concept 2016-10-03 22:45:57 +01:00
David Taylor
e77728c52c Merge pull request #260 from nottinghamtec/subhire-form
Looks good, merging
2016-09-22 13:40:05 +01:00
Sam Osborne
92f4e26883 Added link to subhire form
Until such a point that subhire on RIGS actually happens, it's useful to have this link here.
2016-09-22 12:58:43 +01:00
davidtaylorhq
024f08562b Merge pull request #254 from nottinghamtec/hotfix/newrig-overflow
Fix for MIC field overflowing the bottom of the panel #218
2016-07-14 08:21:21 +01:00
Tom Price
b4246fe170 Fix for MIC field overflowing the bottom of the panel #218 2016-07-14 00:04:09 +01:00
davidtaylorhq
fc6db5bff2 Heroku Staging Setup (#250)
Heroku Staging Setup

Includes data generation
2016-07-13 23:19:31 +01:00
davidtaylorhq
c5d3e7c0f2 Merge pull request #252 from nottinghamtec/hotfix/register-emails
Fix special characters in registration email subject
2016-07-12 23:18:19 +01:00
Tom Price
10b57adb37 Merge branch 'master' into hotfix/register-emails 2016-07-11 23:35:49 +01:00
Tom Price
4f839d05f9 Fix issues with special characters in registration email subject.
Closes #251
2016-07-11 23:28:15 +01:00
Tom Price
84393e9e4a Modify user creation test to replicate special character issue in #251 2016-07-11 23:26:43 +01:00
Tom Price
b94cef92d2 Update selenium due to OS X based firefox issue 2016-07-11 23:26:12 +01:00
David Taylor
10c04be051 Merge branch 'feature/heroku-review'
(needs to be in master)
2016-07-11 20:17:21 +01:00
David Taylor
7ecd6212ac Initial commit of app.json (for heroku review apps) 2016-07-11 20:15:48 +01:00
Tom Price
11180e507c Merged branch develop into master 2016-07-11 13:11:37 +01:00
Tom Price
1c90ce5b41 Merged feature/invoiceDelete into develop 2016-07-11 13:08:47 +01:00
Tom Price
11dd9ad02f Add tmp directory to gitignore 2016-07-11 13:08:05 +01:00
Tom Price
27c0deaba3 Add codeclimit coverage reporting 2016-07-11 12:44:47 +01:00
Tom Price
4c09258566 Enable code climate 2016-07-11 12:40:39 +01:00
Tom Price
7d14429d84 Update status badges 2016-07-11 12:38:43 +01:00
Tom Price
190825f5ef Tidy up coverage to use a .coveragerc file instead of having it .travis.yml 2016-07-11 12:34:51 +01:00
Tom Price
021edfd39d Filter coverage down to just our code 2016-07-11 12:27:00 +01:00
Tom Price
3052f28329 Enable coveralls reporting 2016-07-11 12:15:17 +01:00
Tom Price
4cec20e357 Add collect static command 2016-07-11 12:07:19 +01:00
Tom Price
8a0cbe32bd Remove erroneous travis pip command.
I hate setting up travis
2016-07-11 12:03:21 +01:00
Tom Price
8a3a52a21b Add missing pip commands.
Travis docs say this isn't necessary, fails without https://docs.travis-ci.com/user/languages/python#pip
2016-07-11 12:02:16 +01:00
Tom Price
98a9b22e0e Switch to using travis for builds 2016-07-11 11:58:56 +01:00
David Taylor
9178cf6062 Remove pagination from invoice waiting page 2016-07-10 11:31:25 +01:00
David Taylor
abbb20e49e More invoice UI improvements, makes colour coding of invoice vs events clearer 2016-07-10 11:23:06 +01:00
David Taylor
01d2eae7bc More invoice UI improvements - makes colouring consistent - also closes #242 2016-07-10 11:14:24 +01:00
David Taylor
39d27d2730 Basic invoice UI improvements - closes #232 2016-07-10 10:49:23 +01:00
David Taylor
05b2de561e Added phone links - closes #247 2016-07-10 09:54:35 +01:00
David Taylor
667b0c80ca Added tests for invoice deleting 2016-06-16 01:44:59 +01:00
David Taylor
67624eea6f Allow deleting invoices, if there are no payments yet 2016-06-15 23:18:46 +01:00
David Taylor
e1578eb0d4 Fixed responsive table fail 2016-06-15 13:00:14 +01:00
David Taylor
a7247c273e Fixed #245 2016-06-14 19:50:35 +01:00
David Taylor
f265da2f1d Fixed #241 and #244 2016-06-14 19:45:45 +01:00
David Taylor
1163b117e4 Fixed #240 2016-06-14 19:23:40 +01:00
David Taylor
f92f418bc5 Fixed waiting invoice counter - closes #239 2016-06-06 23:06:30 +01:00
David Taylor
9108cb3c4e Fail! Hide non-rigs from waiting invoices 2016-06-04 18:08:43 +01:00
David Taylor
08d17adc8a Merge branch 'develop' 2016-06-04 17:55:23 +01:00
David Taylor
68b35c2d24 Removed print button conditions following discussion 2016-05-29 23:47:56 +01:00
David Taylor
5cc69cbb41 Stopped things opening in a new window, because it's really annoying. If you want to do this, use the appropriate keyboard shortcut or mouse button 2016-05-29 23:03:41 +01:00
David Taylor
a48afb9157 Added internal/external indicators to invoice lists 2016-05-29 22:56:58 +01:00
David Taylor
3ccbdff737 Added balance to invoice page - closes #235 2016-05-29 22:51:41 +01:00
David Taylor
0990f0bfbb Only display invoice print button for external clients 2016-05-29 22:46:49 +01:00
David Taylor
f43635ee89 Added more useful information to the invoice tables 2016-05-29 22:42:17 +01:00
David Taylor
705f1bda2b Fix the query for the 'outstanding' invoices page. Previously this only displayed events with an end date set. 2016-05-29 22:05:53 +01:00
David Taylor
0ff0d06eaf Fix counter on outstanding invoices page ('length' property doesn't work because of the custom SQL query) 2016-05-29 22:04:48 +01:00
David Taylor
a769486c9c Changed order of invoice menu items to make it more intuitive (now in order of workflow) 2016-05-29 21:37:14 +01:00
David Taylor
83302c4439 Invoice UI improvements. Renamed pages, added description, and added total number of events 2016-05-29 21:30:05 +01:00