arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 13:32:15 +00:00
Code Issues Projects Releases Wiki Activity
221 Commits 54 Branches 0 Tags
d2c95a46c458c14cd6aa60e83b26eb2815708d82
Commit Graph

167 Commits

Author SHA1 Message Date
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
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
David Taylor
94a07c71c7 Fixed issue #61 - caused by typo in 0940d9f 2015-04-19 23:40:12 +01:00
David Taylor
9f902eabb6 Made it work for users that already exist in database 2015-04-19 17:28:22 +01:00
David Taylor
065fc6727f Added authentication decorator & reset key functionality 2015-04-19 17:07:28 +01:00
David Taylor
f1e5088271 Add interface to view API key 2015-04-19 17:06:52 +01:00
David Taylor
f4ffb6f256 Added api key stuff to profile model 2015-04-19 17:06:03 +01:00
David Taylor
b7120aa8f3 Tidied up & added comments 2015-04-18 23:12:57 +01:00
David Taylor
895b1c177e Made more efficient & split view into a separate file 2015-04-18 22:39:58 +01:00
David Taylor
0ba4c8982e Working version of ics interface - not very efficient 2015-04-04 00:19:17 +01:00
David Taylor
583b2514af Attempt using ical extension - not working 2015-04-03 20:45:58 +01:00
Tom Price
c0522728fe Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs 2015-03-31 16:50:43 +01:00
Tom Price
d13d872c20 Update new item rows buttons with data. Issue #48 2015-03-31 16:50:19 +01:00
David Taylor
6dc101a961 Changed to wavatar default 2015-03-31 16:50:14 +01:00
Tom Price
0940d9f275 Bug fix for incorrectly formatted dates issue #47 2015-03-31 16:40:15 +01:00
Tom Price
ec9b108742 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
c3aa3763a7 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
8340fd49d4 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
99208f4022 Add conditionals to related models links. Bugfix for #41 2015-03-31 10:29:48 +01:00
Tom Price
6cdfb826f2 Fix unhelpful error message issue #42 2015-03-31 09:03:45 +01:00
David Taylor
a2be5d00b8 Add unique initial validation 2015-03-31 02:05:50 +01:00
David Taylor
98d0851f58 Added first & last name fields to registration form 2015-03-31 01:41:03 +01:00
Tom Price
9ac0326b4b Change ordering for events to start_date first. 2015-03-30 19:59:24 +01:00
Tom Price
da8fffcf10 Add non rig status changing #37 2015-03-30 19:49:58 +01:00
Tom Price
d012b52bce Add Dry Hire label #38 2015-03-30 19:45:02 +01:00
Tom Price
089719fe05 Add status label and muting for cancelled events issue #36 2015-03-30 19:37:42 +01:00
Tom Price
3f06e0b909 Change table classes to show non rigs issue #37 2015-03-30 19:15:41 +01:00
tomtom5152
9ebf3d4769 Bug fix for #35 2015-03-29 22:54:29 +01:00
tomtom5152
881fdda2c7 Add many links to event detail. Potential fix for #34 2015-03-29 21:43:12 +01:00
tomtom5152
95111695b9 Add edit autocomplete buttons to edit rig page. 
Issue #22
 2015-03-29 14:22:58 +01:00
tomtom5152
c954aa2497 Add edit urls to API results. 
Change mic API lookup to profile
 2015-03-29 13:40:52 +01:00
tomtom5152
188f06afc2 Fix mouseover text. Tidy up non rig detail 2015-03-28 17:32:47 +00:00
tomtom5152
cc85b44ba3 Add rig collected by information issue #25 2015-03-28 17:12:37 +00:00
tomtom5152
1120409e88 Change save icon to floppy #24 
Add bugfix for flow on small screens
 2015-03-28 16:54:51 +00:00
tomtom5152
194337830d Improve UI on event screen for dealing with long email addresses. 2015-03-28 16:34:06 +00:00
tomtom5152
3030316ff5 Unkown bug fix, this appears to work. 2015-03-27 16:00:18 +00:00
tomtom5152
d7a3bdf3d6 Merge branch 'master' of bitbucket:nottinghamtec/pyrigs 2015-03-27 15:52:13 +00:00
Tom Price
4883b9dc01 Merged in users (pull request #1) 
Ability to view a users details and edit them
 2015-03-27 15:49:53 +00:00
tomtom5152
f013cfb968 Bug fix for #30 2015-03-27 12:21:21 +00:00
tomtom5152
2a3875f198 Bug fix for non unicode in admin panel. 
Add __str__ for Payments
 2015-03-27 12:15:10 +00:00
tomtom5152
d70ad24c53 Bugfix for #27 2015-03-26 14:16:03 +00:00
tomtom5152
7c52d8334c Bug fix for #23 2015-03-26 13:19:47 +00:00
tomtom5152
f1e75d1656 Add missing profile_form.html template 2015-03-25 21:10:45 +00:00
tomtom5152
048c4b801a Add user editing 2015-03-25 20:21:54 +00:00
tomtom5152
e5fa55ea6c Added viewing user profiles 2015-03-25 18:56:29 +00:00
Tom Price
64d6d134b6 Fixed syntax error in analytics.html 2015-03-13 15:28:34 +00:00