David Taylor
|
d2cc9b8460
|
Changed to 'PO' and corrected capitalisation in 'Collected by'
|
2015-04-24 01:22:46 +01:00 |
|
David Taylor
|
c242cec49f
|
Merge commit 'fb5173432e13d62f8fadabd58f6b969d9216049e' into purchase-order
|
2015-04-24 01:21:24 +01:00 |
|
Tom Price
|
fb5173432e
|
Merged in paginiation-ui (pull request #20)
Fixed display in firefox #77
|
2015-04-24 00:47:58 +01:00 |
|
Tom Price
|
3c1bbc6c5d
|
Merged in invoice-ui (pull request #21)
Requested additions to invoice_detail
|
2015-04-24 00:47:26 +01:00 |
|
Tom Price
|
e3279b2adc
|
Merged in ical-interface (pull request #19)
Stripped out all timezone references & added help info
|
2015-04-24 00:46:54 +01:00 |
|
Tom Price
|
7b9f7d311d
|
Merged in js-datepicker (pull request #22)
JS Datepicker - issue #79
|
2015-04-24 00:42:36 +01:00 |
|
David Taylor
|
0e7232a16c
|
Corrected comment
|
2015-04-24 00:10:14 +01:00 |
|
David Taylor
|
4560be158a
|
Added PO field to event form
|
2015-04-23 23:58:54 +01:00 |
|
David Taylor
|
d8b88cc792
|
Merge branch 'master' into autocomplete-ui
|
2015-04-22 18:38:07 +01:00 |
|
David Taylor
|
0a8759240a
|
Fixed by not loading transition.js (conflicts with JQuery UI). We can make do without an animated date picker
|
2015-04-22 18:29:01 +01:00 |
|
David Taylor
|
9494f00dd0
|
Working date picker fallback. This breaks item modals because... no idea
|
2015-04-22 18:14:21 +01:00 |
|
David Taylor
|
307618df31
|
Requested additions to invoice_detail
|
2015-04-22 17:18:13 +01:00 |
|
David Taylor
|
da37904000
|
Fixed display in firefox
|
2015-04-22 17:01:10 +01:00 |
|
David Taylor
|
3397bb772d
|
Don't serve cancelled rigs
|
2015-04-22 16:11:11 +01:00 |
|
David Taylor
|
a464c210dd
|
Better help info
|
2015-04-22 15:57:00 +01:00 |
|
David Taylor
|
88c67054b6
|
Back to 12 month query
|
2015-04-22 15:31:50 +01:00 |
|
David Taylor
|
53c804cfc6
|
Apparently google doesn't work without www.
|
2015-04-22 15:29:17 +01:00 |
|
David Taylor
|
70d887f91b
|
Added more help
|
2015-04-22 14:54:42 +01:00 |
|
David Taylor
|
551e1117eb
|
Added google calendar instructions
|
2015-04-22 14:41:06 +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 |
|
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 |
|
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 |
|
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 |
|
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
|
ad2ed85ad6
|
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
|
d2c95a46c4
|
Merge commit '0d719b328fd95504bdc6dabea96d65e5a485677b' 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
|
4174baebd2
|
Merged in end-times-hidden (pull request #11)
Fix for issue #57
|
2015-04-20 13:59:35 +01:00 |
|
David Taylor
|
ca94c0b31b
|
Fixed permissions - now has same access requirements as rig archive (login_required)
|
2015-04-20 13:48:18 +01:00 |
|
David Taylor
|
d60d6b66d0
|
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
|
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 |
|