Commit Graph

82 Commits

Author SHA1 Message Date
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
brett bd87789d88 Temp commit for register feature 2017-10-04 17:31:16 +01:00
Oliver Marks c1ed938b04 Cleanup, and better handling in the cancellation flow more work to come 2017-10-01 23:16:32 +01:00
Oliver Marks 574286e8e3 Fix duplicate records in membership table. 2017-09-17 10:50:09 +01:00
Oliver Marks 22a700bc5e Change X-Frame options, and apply styling tweak to wiki preview 2017-09-16 08:55:58 +01:00
Oliver Marks e01770cd06 Add X frame option for wiki preview 2017-09-15 23:00:48 +01:00
Oly ed9958b2ad setting up test data 2017-09-14 13:46:54 +01: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 28e0cd8f94 Updated notifications and open grpah for forums and wiki, should now email new
topics to the mailing list.
2017-09-14 13:34:13 +01:00
Sam Collins 8c99019476 Added back old password hashing algorithms 2017-09-13 19:37:59 +01:00
Oly 409f6651c3 bump site version to use correct domain 2017-09-08 13:50:22 +01:00
Oly 5e5312fe74 testing new celery task for auto notifications 2017-09-07 22:03:05 +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 b3d580d49c Add missing brackets to as_view, to fix #135 2017-07-12 22:07:47 +01:00
Oliver Marks eac7ee9211 Initial version of home page rss.xml feed 2017-06-01 20:30:40 +01:00
Oliver Marks 7737058f0f fixes #96 you can now view users or members when clicking the tabs 2017-04-22 15:55:40 +01:00
Oliver Marks 42f09e376f Take redirect url from env file 2017-04-20 20:33:28 +01:00
Oly a6e0bccb25 Changes to fix gocardless payment issue needs a bit more work to fix domain used 2017-04-20 14:23:17 +01:00
Sam Collins c1f6d3f22e
Switched to class based views for blog 2017-03-22 23:47:14 +00:00
Oly 3dfdb9fc00 disable http csrf cookie param so it can be sent via ajax for production 2017-03-20 13:41:59 +00:00
Oly 8ec4cea078 disable http csrf cookie param so it can be sent via ajax 2017-03-20 08:54:36 +00:00
Oliver Marks 4ee80469e5 add www to aloowed hosts 2017-03-05 14:39:08 +00:00
Sam Collins 05d77e7c05
Added blog sitemap 2017-03-01 00:58:58 +00:00
Sam Collins 45c59f0707
Improved Schema notation to hopefully improve SEO 2017-03-01 00:43:51 +00:00
Oliver Marks 8a6638e28d Enable whitenoise for dev environment, closer to production 2017-02-28 21:19:03 +00:00
Oliver Marks bc324c5769 Change /admin url to /trustee so its less obvious to spiders looking for exploits 2017-02-28 20:25:38 +00:00
Oliver Marks b3967e30e1 dont use github for emojis now stored in project, will helpp with ssl 2017-02-28 18:34:14 +00:00
Oly bb9865cd97 Merge remote-tracking branch 'remotes/origin/draceditor' 2017-02-28 09:02:24 +00:00
Oliver Marks db212d90de enable auth providers 2017-02-27 20:36:30 +00:00
Oliver Marks 280601f3aa enable image uploader 2017-02-27 19:33:38 +00:00
Oliver Marks 615514259d implemented for blog as a test 2017-02-27 19:15:27 +00:00
Oliver Marks 60c3c8ed8e markdownx example 2017-02-27 19:07:13 +00:00
Sam Collins 9e0ada5f3d Added Auth to Django REST API 2017-02-26 08:36:59 +00:00
Sam Collins 7453c056ae Removed Refrence to Django Rest Framework 2017-02-26 08:36:59 +00:00
Sam Collins 9db20fb458 Added Blog and Feeds API 2017-02-26 08:36:59 +00:00