David Taylor
|
01b684d08a
|
Better help info
|
2015-04-22 15:57:00 +01:00 |
|
David Taylor
|
c060ceff05
|
Back to 12 month query
|
2015-04-22 15:31:50 +01:00 |
|
David Taylor
|
c0970fa6f5
|
Apparently google doesn't work without www.
|
2015-04-22 15:29:17 +01:00 |
|
David Taylor
|
f712e8f375
|
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
|
b4806b943e
|
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 |
|
David Taylor
|
efc1eb2f61
|
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 |
|
Tom Price
|
b958c4e00c
|
README.md edited online with Bitbucket
|
2015-04-21 23:32:33 +00: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
|
f32c0683b2
|
Merged in paperwork (pull request #16)
New paperwork - See issue #17
|
2015-04-21 22:20:41 +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
|
d380ca1049
|
Merged in ics-interface (pull request #6)
iCal Interface
|
2015-04-21 21:26:01 +01:00 |
|
Tom Price
|
3aaba4633c
|
Merge conflict from master
|
2015-04-21 19:57:45 +01:00 |
|
David Taylor
|
7e285f6d80
|
Rig links open in _blank
|
2015-04-21 19:43:32 +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
|
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 |
|
Tom Price
|
dd335c7d02
|
Merged in web-calendar (pull request #7)
Added Web Calendar View
|
2015-04-21 18:14:39 +01:00 |
|
Tom Price
|
f03ff47062
|
Merge from master
|
2015-04-21 18:13:07 +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
|
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
|
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
|
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
|
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
|
66fb87a95e
|
Changed item_table to use "Total (ex. VAT)" instead of "Sum Total"
|
2015-04-21 11:57:49 +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
|
3884519bb1
|
Changed top to match headed paper
|
2015-04-21 11:03:58 +01:00 |
|
David Taylor
|
1f1d5db72a
|
Add url to description
|
2015-04-20 15:43:02 +01:00 |
|
David Taylor
|
1213971f1f
|
Merge commit '3869751b8c5795a73418a3645c0ec2d8a27cf70c' into web-calendar
|
2015-04-20 15:20:29 +01:00 |
|
David Taylor
|
57b2fd5a69
|
Merge commit '3869751b8c5795a73418a3645c0ec2d8a27cf70c' into ics-interface
|
2015-04-20 15:19:25 +01:00 |
|
Tom Price
|
8d11331963
|
Merged in change-gravatar (pull request #5)
Changed to wavatar default
|
2015-04-20 14:01:21 +01:00 |
|
Tom Price
|
20ebca6c81
|
Merged in end-times-hidden (pull request #11)
Fix for issue #57
|
2015-04-20 13:59:35 +01:00 |
|
Tom Price
|
7406668288
|
Merged in meet_at (pull request #9)
Fixed issue #61 - caused by typo in 0940d9f
|
2015-04-20 13:57:41 +01:00 |
|
David Taylor
|
7a24883ea7
|
Fixed permissions - now has same access requirements as rig archive (login_required)
|
2015-04-20 13:48:18 +01:00 |
|
David Taylor
|
2930595b03
|
Added api_key database migrations. Also includes other outstanding migrations:
- Change Meta options on invoice
- Add field api_key to profile
- Alter field collector on event
- Alter field initials on profile
|
2015-04-20 12:57:42 +01:00 |
|
David Taylor
|
c224866a50
|
Actual fix for #57 (Django templates don't like parenthesis in logic)
|
2015-04-20 00:59:00 +01:00 |
|
David Taylor
|
3ce3a4ba67
|
Fix for issue #57
|
2015-04-20 00:15:10 +01:00 |
|
David Taylor
|
e3145ef986
|
Rig numbers for all invoice lists now link to event_detail page - issue #65
|
2015-04-20 00:03:40 +01:00 |
|
David Taylor
|
c1937eb2d7
|
Fixed issue #61 - caused by typo in 0940d9f
|
2015-04-19 23:40:12 +01:00 |
|
David Taylor
|
30210fe85a
|
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
|
df1a285089
|
Added calendar view
|
2015-04-19 22:25:59 +01:00 |
|
David Taylor
|
f40cfa7490
|
Made it work for users that already exist in database
|
2015-04-19 17:28:22 +01:00 |
|
David Taylor
|
a7a1d4d3b8
|
Actually added authentication decorator this time
|
2015-04-19 17:08:16 +01:00 |
|
David Taylor
|
a7f392f0bc
|
Added authentication decorator & reset key functionality
|
2015-04-19 17:07:28 +01:00 |
|
David Taylor
|
29f873c640
|
Add interface to view API key
|
2015-04-19 17:06:52 +01:00 |
|
David Taylor
|
df88222e00
|
Added api key stuff to profile model
|
2015-04-19 17:06:03 +01:00 |
|
David Taylor
|
94194d0613
|
Tidied up & added comments
|
2015-04-18 23:12:57 +01:00 |
|