Commit Graph

101 Commits

Author SHA1 Message Date
Sam Collins cb29f28a78 New JWT token based RFID view 2018-10-17 19:22:51 +01:00
Sam Collins d1448c7041 Udpated Django Version 2018-10-08 08:50:59 +01:00
Oliver Marks d4357e3a75 Update feed parser to us different library 2018-09-18 20:31:49 +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 9c23136214 adjusting boto to store media in a bucket instead of locally on the server 2018-09-14 22:03:45 +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
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
Sam Collins f7fb3f5cf7 New project fixes 2018-03-09 10:46:19 +00:00
Oliver Marks ae1f830785 Simplify config fix wiki styles. 2018-02-03 19:21:12 +00:00
Oliver Marks 6ab5049e88 move requirement 2018-01-31 07:30:27 +00:00
Oliver Marks 43a98f7164 Sass fix for permissions 2018-01-30 14:19:39 +00:00
Oliver Marks 579478bb87 Adjust config for dev to be more like live 2018-01-29 14:30:11 +00:00
Oliver Marks 0c01228a05 adjust permissions 2018-01-28 12:25:04 +00:00
Oliver Marks 95d45661b3 Updated containerr versions 2018-01-27 21:55:26 +00:00
Oliver Marks 276a87c0b3 Now on the bucket list :) 2018-01-21 21:06:51 +00:00
Oliver Marks 7d67e9e9e5 requests wip 2018-01-18 14:12:23 +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
Oly 8a2fa40f04 Change include to use custom django wiki temporarily 2017-10-30 13:41:36 +00:00
Oliver Marks 69af967ae6 Initial rfid models, to think about any thoughts ?
remove mapping model on base on @scollins suggestion

Updated models, enabled it in the admin backup to get an idea of the structure.
will need to rebuild, updating restframework

current state of experiment into rfid api

Change docs url

started looking into web tokens

Refactor models

More experimenting

Custom view now works, needs tiding up and data to test
2017-09-14 13:46:54 +01:00
Oly c2efc2cae0 Fixes #56 use newer password hasher 2017-09-06 09:05:24 +01:00
Oliver Marks fbaa7fb50d implemented django wiki, created requests page, and added to nav 2017-09-05 20:07:48 +01:00
Oliver Marks 10039e0b0e celery integration tasks now working, improved feed image variation rendering 2017-08-22 22:47:44 +01:00
Oliver Marks 633497be6c celery integration 2017-08-15 07:26:06 +01:00
Oly 54e1bce190 change subscription mechanism to use new gocardless api 2017-08-14 14:00:59 +01:00
Oliver Marks c33f4796cb Merge pull request #94 from maidstone-hackspace/pyup-update-django-environ-0.4.2-to-0.4.3
Update django-environ to 0.4.3
2017-07-05 14:02:39 +01:00
Oliver Marks 88da8cfb07 Merge pull request #97 from maidstone-hackspace/pyup-update-django-redis-4.7.0-to-4.8.0
Update django-redis to 4.8.0
2017-07-05 14:02:14 +01:00
Oliver Marks b336834c33 Merge pull request #126 from maidstone-hackspace/pyup-update-libsass-0.12.3-to-0.13.2
Update libsass to 0.13.2
2017-07-05 13:57:41 +01:00
Oliver Marks c9385ebaa1 Merge pull request #130 from maidstone-hackspace/pyup-update-pillow-4.1.0-to-4.2.0
Update pillow to 4.2.0
2017-07-05 13:57:18 +01:00
Oliver Marks b0bffdc7f3 Merge pull request #108 from maidstone-hackspace/pyup-update-braintree-3.35.0-to-3.37.2
Update braintree to 3.37.2
2017-07-05 12:59:04 +01:00
pyup-bot de90af456c Update django from 1.11.1 to 1.11.3 2017-07-02 03:21:53 +01:00
pyup-bot b0b51b8f14 Update pillow from 4.1.0 to 4.2.0 2017-07-01 18:30:56 +01:00
pyup-bot 008df61d43 Update libsass from 0.12.3 to 0.13.2 2017-06-15 03:31:29 +01:00
Oliver Marks 45aa5188a9 Merge pull request #98 from maidstone-hackspace/pyup-update-django-allauth-0.31.0-to-0.32.0
Update django-allauth to 0.32.0
2017-05-23 22:09:22 +01:00
Oliver Marks 4b7bf90b62 Merge pull request #111 from maidstone-hackspace/pyup-update-djangorestframework-3.6.2-to-3.6.3
Update djangorestframework to 3.6.3
2017-05-23 22:09:00 +01:00
pyup-bot d34134a1e2 Update djangorestframework from 3.6.2 to 3.6.3 2017-05-12 18:23:38 +01:00
pyup-bot 09f3f254d4 Update django from 1.11 to 1.11.1 2017-05-06 16:38:36 +01:00
pyup-bot e103eaad74 Update braintree from 3.35.0 to 3.37.2 2017-05-05 22:28:21 +01:00
pyup-bot 70ec17242e Update django-allauth from 0.31.0 to 0.32.0 2017-04-27 10:10:59 +01:00
pyup-bot 01f596da8a Update django-redis from 4.7.0 to 4.8.0 2017-04-25 13:57:19 +01:00
pyup-bot b8af661317 Update django-environ from 0.4.2 to 0.4.3 2017-04-19 19:01:25 +01:00
pyup-bot ec2cc5c649 Update django-model-utils from 2.6 to 3.0.0 2017-04-14 01:36:04 +01:00
Oliver Marks d6ad83ffaa Merge pull request #88 from maidstone-hackspace/pyup-update-django-environ-0.4.1-to-0.4.2
Update django-environ to 0.4.2
2017-04-13 23:03:25 +01:00
pyup-bot c06c4d0443 Update django-environ from 0.4.1 to 0.4.2 2017-04-13 17:12:00 +01:00
pyup-bot 8a56c34a23 Pin draceditor to latest version 1.1.8 2017-04-12 08:42:57 +01:00
Oly 3b471b2bbb use unmodified draceditor adjust drone timeout 2017-04-12 08:42:32 +01:00
Oliver Marks b9513e59af Merge pull request #75 from maidstone-hackspace/pyup-update-pytz-2016.10-to-2017.2
Update pytz to 2017.2
2017-04-09 11:29:57 +01:00