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
|
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 |
|
David Taylor
|
ba020b43f1
|
Merge branch 'master' into develop
|
2016-05-29 20:28:52 +01:00 |
|
David Taylor
|
eaf5c9687e
|
Fixed typo, closes #174
|
2016-05-29 20:21:23 +01:00 |
|
David Taylor
|
a725ef5caf
|
Removed add to google calendar link, closes #237
|
2016-05-29 17:09:52 +01:00 |
|
David Taylor
|
aa79f3628e
|
Only redirect to HTTPS in production
|
2016-05-28 15:27:38 +01:00 |
|
David Taylor
|
000351d884
|
Redirect all requests to https
|
2016-05-28 15:20:15 +01:00 |
|
David Taylor
|
db58c113aa
|
Changed font to load over https - #236
|
2016-05-28 14:52:48 +01:00 |
|
Tom Price
|
7cb8503164
|
Merged feature/invoice-total into develop
|
2016-05-24 18:44:27 +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 |
|
davidtaylorhq
|
71b69aa0f6
|
Merge pull request #220 from nottinghamtec/merge-interface
Merge interface
|
2016-04-06 22:08:32 +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 |
|
David Taylor
|
ca6cddb392
|
Add comments display to versioning history (because why not).
Maybe in future we could have a box people can type in before they save changes to an event... But that's a separate project
|
2016-04-05 11:50:34 +01:00 |
|
David Taylor
|
33ce4b622d
|
Fixed bug with versioning interface when related objects are deleted
|
2016-04-05 04:18:53 +01:00 |
|
David Taylor
|
46434977fb
|
Created merge admin action for Person, Venue and Organisation models. Added template.
|
2016-04-05 04:18:19 +01:00 |
|
davidtaylorhq
|
f13303490a
|
Merge pull request #211 from nottinghamtec/wercker
Wercker
|
2016-03-24 12:34:00 +00:00 |
|
David Taylor
|
84b0a57e14
|
Fixed line breaks for new items. Closes #212
|
2016-03-24 12:22:37 +00:00 |
|
Tom Price
|
2ee7c064af
|
Add a dirty work around for wercker not quite working correctly.
|
2016-03-18 16:48:43 +00:00 |
|
Tom Price
|
b2b8546e3c
|
Add test for events_in_bounds
|
2016-03-18 16:41:13 +00:00 |
|