ae1f830785
Simplify config fix wiki styles.
2018-02-03 19:21:12 +00:00
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
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
b662c38607
adjusted config for local and prod
2018-01-26 13:53:42 +00:00
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
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
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
d80138e4ed
Completed register app
2017-10-06 20:16:34 +01:00
c251621e93
Fixed bug with urls and blog
2017-10-04 20:29:23 +01:00
58fbfc5621
Switched to django celery results database backend
2017-10-04 18:23:22 +01:00
de4f11878b
Merge from upstream/master
2017-10-04 17:55:34 +01:00
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
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
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
8c99019476
Added back old password hashing algorithms
2017-09-13 19:37:59 +01:00
409f6651c3
bump site version to use correct domain
2017-09-08 13:50:22 +01:00
5e5312fe74
testing new celery task for auto notifications
2017-09-07 22:03:05 +01:00
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
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
a6e0bccb25
Changes to fix gocardless payment issue needs a bit more work to fix domain used
2017-04-20 14:23:17 +01:00
c1f6d3f22e
Switched to class based views for blog
2017-03-22 23:47:14 +00:00
3dfdb9fc00
disable http csrf cookie param so it can be sent via ajax for production
2017-03-20 13:41:59 +00:00
Oliver Marks
Oliver Marks