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
252 Commits 54 Branches 0 Tags
da379040009fb3024a53859ff98e60992db9dc86
Commit Graph

252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Taylor
da37904000 Fixed display in firefox 2015-04-22 17:01:10 +01:00
Tom Price
d3180c2998 Merged in button-ui (pull request #18) 
Fixed merge issues & added labels
 2015-04-22 14:16:48 +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
Tom Price
cef10456eb README.md edited online with Bitbucket 2015-04-21 23:32:33 +00: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
fd29ceaecb Merged in ics-interface (pull request #6) 
iCal Interface
 2015-04-21 21:26:01 +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
Tom Price
8eec20d2ab 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
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
Tom Price
3954f00e21 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
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
David Taylor
8c2af1fc67 Rig numbers for all invoice lists now link to event_detail page - issue #65 2015-04-20 00:03:40 +01:00
David Taylor
94a07c71c7 Fixed issue #61 - caused by typo in 0940d9f 2015-04-19 23:40:12 +01:00
David Taylor
d0cc119be6 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
0c8665d370 Added calendar view 2015-04-19 22:25:59 +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
d0c44c921f Actually added authentication decorator this time 2015-04-19 17:08:16 +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