Tom Price
f03ff47062
Merge from master
2015-04-21 18:13:07 +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
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
1213971f1f
Merge commit '3869751b8c5795a73418a3645c0ec2d8a27cf70c' into web-calendar
2015-04-20 15:20:29 +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
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
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
c1937eb2d7
Fixed issue #61 - caused by typo in 0940d9f
2015-04-19 23:40:12 +01:00
David Taylor
df1a285089
Added calendar view
2015-04-19 22:25:59 +01:00
Tom Price
8c135fbc18
Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs
2015-03-31 16:50:43 +01:00
Tom Price
fbabed8be5
Update new item rows buttons with data. Issue #48
2015-03-31 16:50:19 +01:00
David Taylor
80e8efc763
Changed to wavatar default
2015-03-31 16:50:14 +01:00
Tom Price
417fd81b9a
Bug fix for incorrectly formatted dates issue #47
2015-03-31 16:40:15 +01:00
Tom Price
1a2883b931
Merged in Registration-Profile-Names (pull request #2 )
...
Added first & last name fields to registration form #43
Don't need to change the template for this. Woo for being lazy :P
2015-03-31 10:55:20 +01:00
Tom Price
c4911bed6d
Merged in unique-initials (pull request #3 ). Ignore me with model validation, not a thing due to superclass.
...
Add unique initial validation #44
2015-03-31 10:53:44 +01:00
Tom Price
93af55ccbb
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
6e5c6fbb31
Add conditionals to related models links. Bugfix for #41
2015-03-31 10:29:48 +01:00
Tom Price
05d487787d
Fix unhelpful error message issue #42
2015-03-31 09:03:45 +01:00
David Taylor
fa3796a323
Add unique initial validation
2015-03-31 02:05:50 +01:00
David Taylor
430b6cb82a
Added first & last name fields to registration form
2015-03-31 01:41:03 +01:00
Tom Price
e212109a7a
Change ordering for events to start_date first.
2015-03-30 19:59:24 +01:00
Tom Price
4b04716273
Add non rig status changing #37
2015-03-30 19:49:58 +01:00
Tom Price
eefc469946
Add Dry Hire label #38
2015-03-30 19:45:02 +01:00
Tom Price
1de29e2234
Add status label and muting for cancelled events issue #36
2015-03-30 19:37:42 +01:00
Tom Price
ac8bda85e2
Change table classes to show non rigs issue #37
2015-03-30 19:15:41 +01:00
tomtom5152
2a3588e148
Bug fix for #35
2015-03-29 22:54:29 +01:00
tomtom5152
1b221e6933
Add many links to event detail. Potential fix for #34
2015-03-29 21:43:12 +01:00
tomtom5152
7a4c70ab99
Add edit autocomplete buttons to edit rig page.
...
Issue #22
2015-03-29 14:22:58 +01:00
tomtom5152
6c1ba912b8
Add edit urls to API results.
...
Change mic API lookup to profile
2015-03-29 13:40:52 +01:00
tomtom5152
9ca9a0f38d
Fix mouseover text. Tidy up non rig detail
2015-03-28 17:32:47 +00:00
tomtom5152
ff0d703af5
Add rig collected by information issue #25
2015-03-28 17:12:37 +00:00
tomtom5152
83ae129d72
Change save icon to floppy #24
...
Add bugfix for flow on small screens
2015-03-28 16:54:51 +00:00
tomtom5152
422b7b063b
Improve UI on event screen for dealing with long email addresses.
2015-03-28 16:34:06 +00:00
tomtom5152
8d79bb706d
Unkown bug fix, this appears to work.
2015-03-27 16:00:18 +00:00
tomtom5152
8c7983c7ea
Merge branch 'master' of bitbucket:nottinghamtec/pyrigs
2015-03-27 15:52:13 +00:00
Tom Price
c81cc952dd
Merged in users (pull request #1 )
...
Ability to view a users details and edit them
2015-03-27 15:49:53 +00:00
tomtom5152
896c30881f
Bug fix for #30
2015-03-27 12:21:21 +00:00
tomtom5152
7977b6a17c
Bug fix for non unicode in admin panel.
...
Add __str__ for Payments
2015-03-27 12:15:10 +00:00
tomtom5152
534d82a7df
Bugfix for #27
2015-03-26 14:16:03 +00:00
tomtom5152
56979fa81a
Bug fix for #23
2015-03-26 13:19:47 +00:00
tomtom5152
5f53925730
Add missing profile_form.html template
2015-03-25 21:10:45 +00:00
tomtom5152
d699a596f5
Add user editing
2015-03-25 20:21:54 +00:00
tomtom5152
c805379a7f
Added viewing user profiles
2015-03-25 18:56:29 +00:00
Tom Price
8aeeb31491
Fixed syntax error in analytics.html
2015-03-13 15:28:34 +00:00
tomtom5152
3ce01e79c5
Readded start>end checking. Template improvements
...
Added descritpions of all error for the user as well as the image.
Added contextual alert boxes for messages in base.
If start>end start<=>end. Very simple fix, thanks Charlie.
2015-03-05 18:20:43 +00:00
