Commit Graph

345 Commits

Author SHA1 Message Date
David Taylor
551e1117eb Added google calendar instructions 2015-04-22 14:41:06 +01:00
David Taylor
45317efc3a Added button labels 2015-04-22 14:01:24 +01:00
David Taylor
178cae409f Fixed GIT merge issues #76 2015-04-22 13:40:20 +01:00
David Taylor
66236df979 Made a nice new UI for autocompleting 2015-04-22 13:27:56 +01:00
David Taylor
2ec73825c2 initial attempt 2015-04-21 23:55:55 +01:00
Tom Price
0618684de8 Merged in indent-item (pull request #12)
Indented item-description by 1em - issue #56
2015-04-21 22:41:29 +01:00
Tom Price
4d1d649bbc Merged in paperwork (pull request #16)
New paperwork - See issue #17
2015-04-21 22:20:41 +01:00
Tom Price
c0c076e74c Merged in invoice-rig-link (pull request #10)
Rig numbers for all invoice lists now link to event_detail page - issue #65
2015-04-21 21:26:18 +01:00
Tom Price
3b1137c2d6 Merge conflict from master 2015-04-21 19:57:45 +01:00
David Taylor
954c5b9119 Rig links open in _blank 2015-04-21 19:43:32 +01:00
Tom Price
98f0005d67 Add checking URL is secure before using HTTPS for ical requests. In practice, this will always be yes. 2015-04-21 19:31:33 +01:00
David Taylor
643e874c12 New paperwork design 2015-04-21 19:24:49 +01:00
Tom Price
ef1e4bc9a5 Merged in web-calendar (pull request #7)
Added Web Calendar View
2015-04-21 18:14:39 +01:00
Tom Price
a5448ce0a9 Merge from master 2015-04-21 18:13:07 +01:00
Tom Price
44e8f03cf7 Merged in password-change (pull request #8)
Added templates for password_change_form and password_change_done. Added button to profile_detail.
2015-04-21 17:33:24 +01:00
Tom Price
619487a48b Merged in print-new-tab (pull request #13)
Set target of print buttons to _blank - issue #59
2015-04-21 17:05:11 +01:00
Tom Price
5449fba708 Merged in sum-total (pull request #14)
Changed item_table to use "Total (ex. VAT)" instead of "Sum Total" - issue #63
2015-04-21 17:04:52 +01:00
David Taylor
e65c476471 In event_invoice template, new invoice opens new tab, changed icon to gbp to match rest of system 2015-04-21 12:04:44 +01:00
David Taylor
bf2a48dae6 Changed item_table to use "Total (ex. VAT)" instead of "Sum Total" 2015-04-21 11:57:49 +01:00
David Taylor
a1d8d38d91 Set target of print buttons to _blank 2015-04-21 11:44:02 +01:00
David Taylor
a3e0a417e9 Indented item-description by 1em - issue #56 2015-04-21 11:39:55 +01:00
David Taylor
3a57193179 Changed top to match headed paper 2015-04-21 11:03:58 +01:00
David Taylor
013fa7441b Merge commit '0d719b328fd95504bdc6dabea96d65e5a485677b' into web-calendar 2015-04-20 15:20:29 +01:00
David Taylor
d2c95a46c4 Merge commit '0d719b328fd95504bdc6dabea96d65e5a485677b' into ics-interface 2015-04-20 15:19:25 +01:00
David Taylor
12123f7b25 Actual fix for #57 (Django templates don't like parenthesis in logic) 2015-04-20 00:59:00 +01:00
David Taylor
b9d2f1e9aa Fix for issue #57 2015-04-20 00:15:10 +01:00
David Taylor
8c2af1fc67 Rig numbers for all invoice lists now link to event_detail page - issue #65 2015-04-20 00:03:40 +01:00
David Taylor
d0cc119be6 Added templates for password_change_form and password_change_done. Added button to profile_detail. 2015-04-19 23:32:05 +01:00
David Taylor
0c8665d370 Added calendar view 2015-04-19 22:25:59 +01:00
David Taylor
9f902eabb6 Made it work for users that already exist in database 2015-04-19 17:28:22 +01:00
David Taylor
f1e5088271 Add interface to view API key 2015-04-19 17:06:52 +01:00
Tom Price
8340fd49d4 Fix for loosing data when there is a form validation error. Issue #42.
Added info message when there is an validation error and items are not shown.
2015-03-31 10:33:57 +01:00
Tom Price
99208f4022 Add conditionals to related models links. Bugfix for #41 2015-03-31 10:29:48 +01:00
Tom Price
da8fffcf10 Add non rig status changing #37 2015-03-30 19:49:58 +01:00
Tom Price
d012b52bce Add Dry Hire label #38 2015-03-30 19:45:02 +01:00
Tom Price
089719fe05 Add status label and muting for cancelled events issue #36 2015-03-30 19:37:42 +01:00
Tom Price
3f06e0b909 Change table classes to show non rigs issue #37 2015-03-30 19:15:41 +01:00
tomtom5152
9ebf3d4769 Bug fix for #35 2015-03-29 22:54:29 +01:00
tomtom5152
881fdda2c7 Add many links to event detail. Potential fix for #34 2015-03-29 21:43:12 +01:00
tomtom5152
95111695b9 Add edit autocomplete buttons to edit rig page.
Issue #22
2015-03-29 14:22:58 +01:00
tomtom5152
c954aa2497 Add edit urls to API results.
Change mic API lookup to profile
2015-03-29 13:40:52 +01:00
tomtom5152
188f06afc2 Fix mouseover text. Tidy up non rig detail 2015-03-28 17:32:47 +00:00
tomtom5152
cc85b44ba3 Add rig collected by information issue #25 2015-03-28 17:12:37 +00:00
tomtom5152
1120409e88 Change save icon to floppy #24
Add bugfix for flow on small screens
2015-03-28 16:54:51 +00:00
tomtom5152
194337830d Improve UI on event screen for dealing with long email addresses. 2015-03-28 16:34:06 +00:00
tomtom5152
3030316ff5 Unkown bug fix, this appears to work. 2015-03-27 16:00:18 +00:00
tomtom5152
f1e75d1656 Add missing profile_form.html template 2015-03-25 21:10:45 +00:00
tomtom5152
048c4b801a Add user editing 2015-03-25 20:21:54 +00:00
tomtom5152
e5fa55ea6c Added viewing user profiles 2015-03-25 18:56:29 +00:00
tomtom5152
af1396a168 Added the ability to invoice an event 2015-01-30 00:27:02 +00:00