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
9d50b92f40
Fix up user rfid urls
2018-01-15 18:32:19 +00:00
Oliver Marks
1fb2b65df2
Added flag to track completed equipment requests
2018-01-14 18:25:02 +00:00
Oliver Marks
9f9f9e4795
Updated draceditor to martor, project was renamed.
2018-01-06 20:59:38 +00:00
8678c06108
Added basic creation and deletion buttons for RFID
2017-11-01 17:57:10 +00:00
7ce5d0dbbf
Added rfid card listing and removed user drop down from rfid create form
2017-10-25 20:19:30 +01:00
f9a99ccf47
Merge remote-tracking branch 'origin/master' into issue-153
2017-10-19 21:44:29 +01:00
ad0fa959fa
Added new class to allow request descriptions to span the whole row
2017-10-19 20:58:26 +01:00
0f4069a40a
Update home.html
...
Alteration to sentence.
2017-10-18 20:18:29 +01:00
Oliver Marks
1fe57ef0b4
Increase pagination size, and change class from sm-2 to sm-12
2017-10-14 09:06:41 +01:00
Oliver Marks
21f25d0aa6
Merge pull request #157 from olymk2/master
...
fix duplicate surname on membership card
2017-10-11 21:57:51 +01:00
Oliver Marks
95d78225e5
fix duplicate surname on membership card
2017-10-11 21:56:20 +01:00
Oliver Marks
3c505fd63e
Merge pull request #152 from Brett78/issue-137
...
Added missing migration files for register app
2017-10-08 09:40:23 +01:00
e586ed772c
Added missing migration files for register app
2017-10-07 14:20:07 +01:00
Oliver Marks
5acf72a5fa
Merge pull request #150 from Brett78/issue-137
...
User register feature
2017-10-07 13:19:24 +01:00
Oliver Marks
9169c0dd52
Fixed amount display so its in pounds not pence, fixed cancel
2017-10-07 13:00:17 +01:00
ac133ab67a
Removed unnecessary js script
2017-10-06 20:26:20 +01:00
d80138e4ed
Completed register app
2017-10-06 20:16:34 +01:00
6524233bd8
Fixed styling issues
2017-10-06 13:52:59 +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
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
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
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
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
Oliver Marks
Oliver Marks