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
234 Commits 54 Branches 0 Tags
d380ca10493f3605b725e3755d3973d7857a7c5b
Commit Graph

234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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