Commit Graph

1724 Commits

Author SHA1 Message Date
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
1f1d5db72a 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
1213971f1f Merge commit '3869751b8c5795a73418a3645c0ec2d8a27cf70c' 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
David Taylor
57b2fd5a69 Merge commit '3869751b8c5795a73418a3645c0ec2d8a27cf70c' 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
8d11331963 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
20ebca6c81 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
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
ca94c0b31b Fixed permissions - now has same access requirements as rig archive (login_required) 2015-04-20 13:48:18 +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
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
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
12123f7b25 Actual fix for #57 (Django templates don't like parenthesis in logic) 2015-04-20 00:59:00 +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
b9d2f1e9aa Fix for issue #57 2015-04-20 00:15:10 +01:00
David Taylor
3ce3a4ba67 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
e3145ef986 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
c1937eb2d7 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
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
0c8665d370 Added calendar view 2015-04-19 22:25:59 +01:00
David Taylor
df1a285089 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
f40cfa7490 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
a7a1d4d3b8 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
a7f392f0bc 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
29f873c640 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
df88222e00 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
94194d0613 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
f21ca248be 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
980f863816 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
David Taylor
5bef0226c8 Attempt using ical extension - not working 2015-04-03 20:45:58 +01:00
Tom Price
defa1f9af4 Add user registration test 2015-04-01 18:32:08 +01:00
Tom Price
8ebc4a25ab Add user registration test 2015-04-01 18:32:08 +01:00
Tom Price
a23a04920a Add conditional to analytics code. 2015-04-01 17:40:28 +01:00