Commit Graph

190 Commits

Author SHA1 Message Date
Oliver Marks 55af847443 Django 2 2018-09-08 10:15:22 +01:00
Oly 2a68819aed Changed to support multiple rooms. 2018-05-17 09:12:36 +01:00
Oliver Marks e73758ae75 Disable message job 2018-05-17 07:16:24 +01:00
Oliver Marks dfc48073f5 Addeded response to twitter task, prefixed the prefix 2018-05-16 20:21:05 +01:00
Oliver Marks ec4a347c96 Fix reading of twitter settings 2018-05-16 19:44:14 +01:00
Oly a2ef1919d1 Fix typo 2018-05-14 09:11:24 +01:00
Oly cc2bea2d87 fix import 2018-05-14 09:08:00 +01:00
Oly 26df8e0294 Simple twitter test command 2018-05-14 08:54:52 +01:00
Oly 53bb9ef699 Added missing includes 2018-05-09 08:38:43 +01:00
Oliver Marks 9c19785a12 Add notifications for membership changes. 2018-05-09 07:00:47 +01:00
Oliver Marks 673c194967 Twitter reminder support 2018-05-08 21:49:13 +01:00
Oliver Marks 54a90f8359 Ldap server integration 2018-05-02 13:57:08 +01:00
cjjbillings 1ae785acf3 Fixed spelling mistake (#176) 2018-03-21 18:08:26 +00:00
Oliver Marks a22bc22538 Better user profile view checking 2018-03-09 19:04:02 +00:00
Oliver Marks e6c2d60fc1 Add amount and total to requests 2018-02-24 19:24:52 +00:00
Oliver Marks b151889518 Add missing popper javascript 2018-02-04 11:34:29 +00:00
Oliver Marks 63f5402170 Change banner active to displayed 2018-02-03 20:28:47 +00:00
Oliver Marks ae1f830785 Simplify config fix wiki styles. 2018-02-03 19:21:12 +00:00
Sam Collins 7426c1fb05 Check if banner images are active 2018-01-31 18:22:39 +00:00
Oliver Marks 43a98f7164 Sass fix for permissions 2018-01-30 14:19:39 +00:00
Oliver Marks 0c01228a05 adjust permissions 2018-01-28 12:25:04 +00:00
Oliver Marks 95d45661b3 Updated containerr versions 2018-01-27 21:55:26 +00:00
Oliver Marks 4958b15034 Footer css tweaks 2018-01-27 16:43:31 +00:00
Oliver Marks d56eaf0c81 Fix page footer 2018-01-27 16:27:55 +00:00
Oliver Marks e2dc3f331d Add in place holder files 2018-01-26 13:20:21 +00:00
Oliver Marks bff7fe8950 Updated readme with backup info 2018-01-26 07:36:08 +00:00
Oliver Marks 70589679a6 Updated deploy steps 2018-01-25 21:45:13 +00:00
Oliver Marks f466e80d2a Fixed top nav to work with bootstrap 4 2018-01-25 20:09:14 +00:00
Oliver Marks 0b2f333ad7 Bootstrap 4 final release update 2018-01-25 14:19:33 +00:00
Oliver Marks 1e18c2d2e0 Fix final test 2018-01-24 13:28:00 +00:00
Oliver Marks 5008051d88 Fixup tests into working state one left to fix 2018-01-23 22:07:43 +00:00
Oliver Marks 8ec2e5cd29 Remove volume causing permission issues 2018-01-22 22:36:02 +00:00
Oliver Marks c3f9a377c9 Fixes to make django markdown work with the wiki 2018-01-20 14:29:04 +00:00
Oliver Marks 61ca8968ae Requests form updated 2018-01-18 21:44:49 +00:00
Oliver Marks 85dfd065e6 Merge branch 'requests' 2018-01-18 18:57:08 +00:00
Oliver Marks 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
Sam Collins 8678c06108 Added basic creation and deletion buttons for RFID 2017-11-01 17:57:10 +00:00
brett 7ce5d0dbbf Added rfid card listing and removed user drop down from rfid create form 2017-10-25 20:19:30 +01:00
brett f9a99ccf47 Merge remote-tracking branch 'origin/master' into issue-153 2017-10-19 21:44:29 +01:00
brett ad0fa959fa Added new class to allow request descriptions to span the whole row 2017-10-19 20:58:26 +01:00
Simon Ridley 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
brett e586ed772c Added missing migration files for register app 2017-10-07 14:20:07 +01:00