Commit Graph

1765 Commits

Author SHA1 Message Date
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
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
66fb87a95e 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
11271898db Set target of print buttons to _blank 2015-04-21 11:44:02 +01:00
David Taylor
11517d7178 Indented item-description by 1em - issue #56 2015-04-21 11:39:55 +01:00
David Taylor
a3e0a417e9 Indented item-description by 1em - issue #56 2015-04-21 11:39:55 +01:00
David Taylor
3884519bb1 Changed top to match headed paper 2015-04-21 11:03:58 +01:00
David Taylor
3a57193179 Changed top to match headed paper 2015-04-21 11:03:58 +01:00
David Taylor
ad2ed85ad6 Add url to description 2015-04-20 15:43:02 +01:00
David Taylor
1f1d5db72a Add url to description 2015-04-20 15:43:02 +01:00
David Taylor
013fa7441b Merge commit '0d719b328fd95504bdc6dabea96d65e5a485677b' into web-calendar 2015-04-20 15:20:29 +01:00
David Taylor
1213971f1f Merge commit '3869751b8c5795a73418a3645c0ec2d8a27cf70c' 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
57b2fd5a69 Merge commit '3869751b8c5795a73418a3645c0ec2d8a27cf70c' into ics-interface 2015-04-20 15:19:25 +01:00
Tom Price
0d719b328f Merged in change-gravatar (pull request #5)
Changed to wavatar default
2015-04-20 14:01:21 +01:00
Tom Price
8d11331963 Merged in change-gravatar (pull request #5)
Changed to wavatar default
2015-04-20 14:01:21 +01:00