Commit Graph

1781 Commits

Author SHA1 Message Date
David Taylor
f712e8f375 Added more help 2015-04-22 14:54:42 +01:00
David Taylor
70d887f91b Added more help 2015-04-22 14:54:42 +01:00
David Taylor
b5d8984c5b Added google calendar instructions 2015-04-22 14:41:06 +01:00
David Taylor
551e1117eb Added google calendar instructions 2015-04-22 14:41:06 +01:00
David Taylor
b4806b943e Stripped out all timezone references. Also reduced query to past 3 months 2015-04-22 14:35:05 +01:00
David Taylor
2a67e9d8b2 Stripped out all timezone references. Also reduced query to past 3 months 2015-04-22 14:35:05 +01:00
Tom Price
de2bed2d46 Merged in button-ui (pull request #18)
Fixed merge issues & added labels
2015-04-22 14:16:48 +01:00
Tom Price
d3180c2998 Merged in button-ui (pull request #18)
Fixed merge issues & added labels
2015-04-22 14:16:48 +01:00
David Taylor
efc1eb2f61 Added button labels 2015-04-22 14:01:24 +01:00
David Taylor
45317efc3a Added button labels 2015-04-22 14:01:24 +01:00
David Taylor
17cf6745e0 Fixed GIT merge issues #76 2015-04-22 13:40:20 +01:00
David Taylor
178cae409f Fixed GIT merge issues #76 2015-04-22 13:40:20 +01:00
David Taylor
279824139a Made a nice new UI for autocompleting 2015-04-22 13:27:56 +01:00
David Taylor
66236df979 Made a nice new UI for autocompleting 2015-04-22 13:27:56 +01:00
Tom Price
b958c4e00c README.md edited online with Bitbucket 2015-04-21 23:32:33 +00:00
Tom Price
cef10456eb README.md edited online with Bitbucket 2015-04-21 23:32:33 +00:00
David Taylor
2ec73825c2 initial attempt 2015-04-21 23:55:55 +01:00
David Taylor
b7d99774b1 initial attempt 2015-04-21 23:55:55 +01:00
Tom Price
04368f1b63 Merged in indent-item (pull request #12)
Indented item-description by 1em - issue #56
2015-04-21 22:41:29 +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
f32c0683b2 Merged in paperwork (pull request #16)
New paperwork - See issue #17
2015-04-21 22:20:41 +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
b0a6cc2e96 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
fd29ceaecb Merged in ics-interface (pull request #6)
iCal Interface
2015-04-21 21:26:01 +01:00
Tom Price
d380ca1049 Merged in ics-interface (pull request #6)
iCal Interface
2015-04-21 21:26:01 +01:00
Tom Price
3b1137c2d6 Merge conflict from master 2015-04-21 19:57:45 +01:00
Tom Price
3aaba4633c 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
David Taylor
7e285f6d80 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
Tom Price
b5d95bc67f 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
Tom Price
c7b0ca4334 Change ical to use dynamically generated URL's instead of a static base URL. 2015-04-21 19:25:46 +01:00
Tom Price
2cfeb49ea0 Change ical to use dynamically generated URL's instead of a static base URL. 2015-04-21 19:25:46 +01:00
David Taylor
4d31f445be New paperwork design 2015-04-21 19:24:49 +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
dd335c7d02 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
f03ff47062 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
00e285cfd0 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
78dbe38aac 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
Tom Price
cda7385eaa 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
Tom Price
8eec20d2ab Merged in invoice-buttons (pull request #15)
In event_invoice template, new invoice opens new tab, changed icon to gbp to match rest of system - issue #72
2015-04-21 17:02:32 +01:00
Tom Price
d1388cf2f0 Merged in invoice-buttons (pull request #15)
In event_invoice template, new invoice opens new tab, changed icon to gbp to match rest of system - issue #72
2015-04-21 17:02:32 +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
329c54c24f 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