Commit Graph

24 Commits

Author SHA1 Message Date
Oliver Marks d19d81fb1e update libraries 2018-09-11 14:07:07 +01:00
Oliver Marks 55af847443 Django 2 2018-09-08 10:15:22 +01:00
Oliver Marks 54a90f8359 Ldap server integration 2018-05-02 13:57:08 +01:00
Oliver Marks e6c2d60fc1 Add amount and total to requests 2018-02-24 19:24:52 +00:00
Oliver Marks 61ca8968ae Requests form updated 2018-01-18 21:44:49 +00:00
Oliver Marks 7d67e9e9e5 requests wip 2018-01-18 14:12:23 +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
Oliver Marks 1fe57ef0b4 Increase pagination size, and change class from sm-2 to sm-12 2017-10-14 09:06:41 +01:00
brett de4f11878b Merge from upstream/master 2017-10-04 17:55:34 +01:00
brett dae32a0bba Swapped login required decorator for login required mixin 2017-10-04 17:26:11 +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
brett 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
Oly a7a3311f8d Better users generated in test data. 2017-09-15 14:05:22 +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
Oly 97e8397d38 Added requests to admin area, added meta data to homepage. 2017-09-12 13:39:15 +01:00
Oly 5e5312fe74 testing new celery task for auto notifications 2017-09-07 22:03:05 +01:00
Oly fdef48041d Added title, and changed layout 2017-09-06 14:03:02 +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