Commit Graph

551 Commits

Author SHA1 Message Date
Tom Price
bfdf0cabbe Add ember to project 2016-08-09 13:18:23 +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
Tom Price
84393e9e4a Modify user creation test to replicate special character issue in #251 2016-07-11 23:26:43 +01:00
Tom Price
11180e507c Merged branch develop into master 2016-07-11 13:11:37 +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
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
83302c4439 Invoice UI improvements. Renamed pages, added description, and added total number of events 2016-05-29 21:30:05 +01:00
David Taylor
ba020b43f1 Merge branch 'master' into develop 2016-05-29 20:28:52 +01:00
David Taylor
a725ef5caf Removed add to google calendar link, closes #237 2016-05-29 17:09:52 +01:00
Tom Price
cc2450ff87 Make total conditional if defined 2016-05-24 17:50:48 +01:00
Tom Price
6b77393414 Fix for incorrect selection of active invoices.
Make sure waiting shows total across all pages.
2016-05-24 17:49:44 +01:00
Tom Price
7ccc8faf20 Add total for waiting events 2016-05-24 17:32:58 +01:00
Tom Price
6030288956 Cheap and dirty active totals 2016-05-24 17:17:52 +01:00
Tom Price
e4a955f323 Reformat code to PEP8 2016-05-23 12:36:21 +01:00
Tom Price
e286d8bdee Merge pull request #229 from nottinghamtec/develop 2016-05-23 00:38:31 +01:00
David Taylor
1faf8f95c8 Fixed colour coding on invoice waiting page 2016-05-22 23:13:23 +01:00
Tom Price
2913b254b4 Fix an overflow issue with dropdown fields. Closes #204 2016-05-19 14:33:33 +01:00
Tom Price
ef81536066 Add tooltips to rig type selectors. Closes #227 2016-05-19 14:21:21 +01:00
David Taylor
29aa13316d Fix for versioning when event has been deleted, closes #226 2016-04-27 20:49:42 +01:00
David Taylor
98f28aaafd Based on has name as well as MIC - Fix #224 2016-04-12 20:15:13 +01:00
David Taylor
f8a2a7a959 Made items display in version history again 2016-04-07 09:23:35 +01:00
David Taylor
767b5512e3 Fail, missed a change, actually closes #185 now 2016-04-07 00:53:57 +01:00
David Taylor
f1bd1ca674 Make 'created' noun class-specific. Closes #185 2016-04-07 00:52:33 +01:00
David Taylor
b47cfed5a9 Fixed versioning UI for revisions containing multiple event versions, hopefully 2016-04-07 00:19:18 +01:00
Tom Price
df61225b73 Optimise imports
So many unused imports, these have been banished
2016-04-06 21:57:54 +01:00
Tom Price
823db68a6a PEP8 format files 2016-04-06 21:53:38 +01:00
Tom Price
ebe08c3bf1 Update tests to check items that aren't selected aren't affected.
PEP8 format the file
2016-04-06 21:52:25 +01:00
David Taylor
44ccead0a4 Added merge tests
I feel like it should be possible to abstract some of these so that they're not copied out for each model, but not sure how to go about it...
2016-04-05 15:32:13 +01:00
David Taylor
99dfdcd253 Make confirmation more useful 2016-04-05 12:53:04 +01:00
David Taylor
03ca65602f Allow sorting by number of events 2016-04-05 12:08:19 +01:00