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
|
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
|
c1937eb2d7
|
Fixed issue #61 - caused by typo in 0940d9f
|
2015-04-19 23:40:12 +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 |
|
David Taylor
|
f21ca248be
|
Made more efficient & split view into a separate file
|
2015-04-18 22:39:58 +01:00 |
|
David Taylor
|
980f863816
|
Working version of ics interface - not very efficient
|
2015-04-04 00:19:17 +01:00 |
|
David Taylor
|
5bef0226c8
|
Attempt using ical extension - not working
|
2015-04-03 20:45:58 +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 |
|
Tom Price
|
b35f294652
|
Remove /static/ and add to ignore.
|
2015-03-31 08:52:47 +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
|
3a1c9e938a
|
Remove threading due to issues with postgres
|
2015-03-28 20:02:47 +00:00 |
|
tomtom5152
|
ca7aeee3e1
|
Bug fix with not oppening the connection
|
2015-03-28 19:56:46 +00:00 |
|
tomtom5152
|
24ed32e7cb
|
Uncomment out all import items
|
2015-03-28 19:33:49 +00: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 |
|