Commit Graph

120 Commits

Author SHA1 Message Date
Oliver Marks 5d4368f603 Fix up tests. 2019-01-14 22:03:56 +00:00
Oliver Marks 11d4ee4659 Rejig the requirements and update drone to latest spec. 2018-12-15 12:37:27 +00:00
Sam Collins 9beabfc0b1 Increased length of RFID code and improved logging (#202) 2018-10-24 19:17:30 +01:00
Sam Collins cb29f28a78 New JWT token based RFID view 2018-10-17 19:22:51 +01:00
Oly 5ba01ee7d3 Add in over 18 check box to membership sign up.
fixes #168
2018-10-10 13:27:47 +01:00
Oliver Marks f41edd2156 Fix local celery, change admin area import articles to a task 2018-09-22 17:48:55 +01:00
Oliver Marks b3cd4aab0b Update images downloader to use requests 2018-09-19 20:17:52 +01:00
Oliver Marks 9d0588e6a1 ditto the above 2018-09-18 21:21:45 +01:00
Oliver Marks 5373393f03 Remove local magic from common 2018-09-18 21:20:21 +01:00
Oliver Marks 88664d2a98 Also update common 2018-09-18 21:16:58 +01:00
Oliver Marks 7e48a1f6ba Correct invalid key names 2018-09-18 21:12:00 +01:00
Oliver Marks 7c6c413d96 Rename for stage and production 2018-09-18 21:09:44 +01:00
Oliver Marks 48016acd62 Rename .env vars 2018-09-18 21:03:26 +01:00
Oliver Marks aecd76b567 Add open graph data to the wiki and other pages 2018-09-18 20:31:49 +01:00
Oliver Marks 83c71485db Add open graph data to the wiki and other pages 2018-09-15 09:47:59 +01:00
Oliver Marks 9c23136214 adjusting boto to store media in a bucket instead of locally on the server 2018-09-14 22:03:45 +01:00
Oly 77a38f1da8 fix open graph for blog, url and image path was incorrect 2018-09-13 20:28:37 +01:00
Oliver Marks d19d81fb1e update libraries 2018-09-11 14:07:07 +01:00
Oliver Marks 55af847443 Django 2 2018-09-08 10:15:22 +01:00
Oly 2a68819aed Changed to support multiple rooms. 2018-05-17 09:12:36 +01:00
Oliver Marks 673c194967 Twitter reminder support 2018-05-08 21:49:13 +01:00
Oliver Marks 54a90f8359 Ldap server integration 2018-05-02 13:57:08 +01:00
Oliver Marks ffbd68f3a5 move debug toolbar 2018-02-03 20:15:38 +00:00
Oliver Marks ae1f830785 Simplify config fix wiki styles. 2018-02-03 19:21:12 +00:00
Oliver Marks 43a98f7164 Sass fix for permissions 2018-01-30 14:19:39 +00:00
Oliver Marks d345791fe3 updated config 2018-01-30 07:25:07 +00:00
Oliver Marks ab36e264c1 change logging 2018-01-29 21:46:24 +00:00
Oliver Marks 579478bb87 Adjust config for dev to be more like live 2018-01-29 14:30:11 +00:00
Oliver Marks 693f624c8e Clean up duplicate lines in production config 2018-01-29 07:34:40 +00:00
Oliver Marks 95d45661b3 Updated containerr versions 2018-01-27 21:55:26 +00:00
Oliver Marks 8eeecaae24 Add cache header for static files 2018-01-27 16:56:06 +00:00
Oliver Marks d56eaf0c81 Fix page footer 2018-01-27 16:27:55 +00:00
Oliver Marks b662c38607 adjusted config for local and prod 2018-01-26 13:53:42 +00:00
Oliver Marks e2dc3f331d Add in place holder files 2018-01-26 13:20:21 +00:00
Oliver Marks bf695f823d Add stage to allowed hosts 2018-01-23 07:15:19 +00:00
Oliver Marks 9a25b90f06 remove copy pasta in config 2018-01-22 21:12:44 +00:00
Oliver Marks 52bab868ff Changes to allow local bucket work inside and outside container 2018-01-22 14:31:54 +00:00
Oliver Marks 276a87c0b3 Now on the bucket list :) 2018-01-21 21:06:51 +00:00
Oliver Marks c3f9a377c9 Fixes to make django markdown work with the wiki 2018-01-20 14:29:04 +00:00
Oliver Marks 85dfd065e6 Merge branch 'requests' 2018-01-18 18:57:08 +00:00
Oliver Marks 7d67e9e9e5 requests wip 2018-01-18 14:12:23 +00:00
Oliver Marks 67facc06f1 Fix for martor markdown display. 2018-01-16 22:12:50 +00:00
Oliver Marks 1fb2b65df2 Added flag to track completed equipment requests 2018-01-14 18:25:02 +00:00
Oliver Marks afdb834daf Disable django wiki login pages and use the default django pages 2018-01-06 21:11:58 +00:00
Oliver Marks 9f9f9e4795 Updated draceditor to martor, project was renamed. 2018-01-06 20:59:38 +00:00
Oliver Marks 5acf72a5fa Merge pull request #150 from Brett78/issue-137
User register feature
2017-10-07 13:19:24 +01:00
brett d80138e4ed Completed register app 2017-10-06 20:16:34 +01:00
Sam Collins c251621e93
Fixed bug with urls and blog 2017-10-04 20:29:23 +01:00
Sam Collins 58fbfc5621 Switched to django celery results database backend 2017-10-04 18:23:22 +01:00
brett de4f11878b Merge from upstream/master 2017-10-04 17:55:34 +01:00