Commit Graph

44 Commits

Author SHA1 Message Date
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 574286e8e3 Fix duplicate records in membership table. 2017-09-17 10:50:09 +01:00
Oliver Marks e01770cd06 Add X frame option for wiki preview 2017-09-15 23:00:48 +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 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 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 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 9db20fb458 Added Blog and Feeds API 2017-02-26 08:36:59 +00:00
Sam Collins a5f0d97d54 First Start of blog system 2017-02-26 08:36:59 +00:00
Oly 02f946b7a2 use picture tag for banners, add in image size 2017-02-15 13:53:19 +00:00
Oliver Marks 3a4e438f31 Better image auto fixtures, now has a fixed larger size 2017-02-14 20:29:45 +00:00
Oliver Marks 6fec0e64bd sass now compiles, cleanup unused files, hooked in sign up form to post to gocardless 2017-02-08 20:32:42 +00:00
Oliver Marks fa5359979d started work on the membership signup form 2017-02-07 20:25:23 +00:00
Oliver Marks ad301febf6 Demo autofixture integration 2017-02-02 18:51:54 +00:00
Oliver Marks 9faf03f1e7 initial docker setup for staging now works 2017-02-02 14:04:17 +00:00
Oly 097a637682 env and settings now loading, need to work on mocking next 2017-01-26 09:10:46 +00:00
Oly a8e8ad80e9 fix env file loading 2017-01-26 08:52:41 +00:00
Oliver Marks 11e19fcf66 Separated payment options, for testing 2017-01-25 22:15:43 +00:00
Sam Collins a3e44d640a
Made Articles get stored in the DB and added image fetching 2017-01-08 03:49:33 +00:00
Oliver Marks 0a2ad28b7c add in stdimage to scale the images 2017-01-07 21:52:03 +00:00
Oliver Marks 21da62b31c Initial member list page, need a group called member and users added to function 2017-01-07 19:21:53 +00:00
Oliver Marks 9abd81245e Initial profile management page 2017-01-06 20:35:56 +00:00
Oliver Marks 2cef5bf87a Added in contact, chat and mailing list templates 2017-01-05 21:01:58 +00:00
Oliver Marks 3311080fde Added in feeds django app, can be manged in the admin backend 2017-01-05 18:43:32 +00:00
Sam Collins 7e200cf71f
Moved all files up one folder 2017-01-04 18:11:25 +00:00