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
dae32a0bba
Swapped login required decorator for login required mixin
2017-10-04 17:26:11 +01:00
3c3f5436b4
Handle members group not existing, change update loop it no longer needs to return
2017-10-03 13:49:18 +01:00
Oliver Marks
d642109c13
Rework some of the payment sign up system
2017-10-02 22:38:26 +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
2e9a428761
Fix replacement error
2017-10-01 14:12:41 +01:00
Oliver Marks
e75fc35db1
Merge branch 'rfid'
2017-10-01 11:55:31 +01:00
Oliver Marks
ec41abfa13
Fix up existing tests
2017-10-01 11:54:35 +01:00
Oliver Marks
bbd72b3a95
Fix up what tests we have so they all pass again
2017-10-01 11:52:58 +01:00
Oliver Marks
88858b5e95
Merge pull request #144 from Brett78/issue-137
...
Requests list now also requires login
2017-09-23 14:53:38 +01:00
849b9bdbb7
Requests list now also requires login
2017-09-23 10:24:40 +01:00
Oliver Marks
833b08980a
Increase decimal places on request form
2017-09-19 21:24:13 +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
Oliver Marks
ae18e8bf38
Fixes #139 wiki preview error
2017-09-15 22:34:14 +01:00
a7a3311f8d
Better users generated in test data.
2017-09-15 14:05:22 +01:00
Oliver Marks
02befa5ddb
Better test data for rfid system
2017-09-14 22:03:26 +01:00
Oliver Marks
1734dc3f9c
Update test data generation
2017-09-14 13:46:54 +01:00
528ad8cade
fixed a few more tests
2017-09-14 13:46:54 +01:00
Oliver Marks
c16e9079ca
small fixes to wip rfid api
2017-09-14 13:46:54 +01:00
ed9958b2ad
setting up test data
2017-09-14 13:46:54 +01:00
Oliver Marks
4b3f57ea7e
refactored rfid model into user, started on user save form
2017-09-14 13:46:54 +01:00
66e012f994
switched to mapping model, lookup in the api does not yet work
2017-09-14 13:46:54 +01:00
54f89e8b5b
Basic Working tests to build on
2017-09-14 13:46:54 +01:00
48c90c95f5
you can now request a device, thinking we need a mapping table again :p
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
Oliver Marks
031a85c9ab
Merge branch 'matrix'
2017-09-12 19:56:05 +01:00
Oliver Marks
79a8faf592
change from svg to png image for og:image meta tag
2017-09-12 19:48:59 +01:00
985782a3f4
move meta tags outside block so they are always available
2017-09-12 13:49:09 +01:00
97e8397d38
Added requests to admin area, added meta data to homepage.
2017-09-12 13:39:15 +01:00
Oliver Marks
d1d7ae7365
update message text, ignore errors for now
2017-09-08 21:49:59 +01:00
409f6651c3
bump site version to use correct domain
2017-09-08 13:50:22 +01:00
80601ce000
matrix tasks for spirit and wiki
2017-09-08 13:35:36 +01:00
5e5312fe74
testing new celery task for auto notifications
2017-09-07 22:03:05 +01:00
da67d703a1
Fixed styling on home link
2017-09-06 17:35:11 +01:00
fdef48041d
Added title, and changed layout
2017-09-06 14:03:02 +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
10024c6646
clean static before regenerating
2017-08-23 13:47:55 +01:00
c741232356
Update text on chat page explaining how to connect
2017-08-23 13:17:54 +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
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
brett
Oliver Marks