 Oliver Marks
|
e6c2d60fc1
|
Add amount and total to requests
|
2018-02-24 19:24:52 +00:00 |
Oliver Marks
|
ae1f830785
|
Simplify config fix wiki styles.
|
2018-02-03 19:21:12 +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
|
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
|
5acf72a5fa
|
Merge pull request #150 from Brett78/issue-137
User register feature
|
2017-10-07 13:19:24 +01:00 |
|
brett
|
ac133ab67a
|
Removed unnecessary js script
|
2017-10-06 20:26:20 +01:00 |
|
Lee
|
6524233bd8
|
Fixed styling issues
|
2017-10-06 13:52:59 +01:00 |
|
brett
|
de4f11878b
|
Merge from upstream/master
|
2017-10-04 17:55:34 +01:00 |
|
brett
|
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
|
e75fc35db1
|
Merge branch 'rfid'
|
2017-10-01 11:55:31 +01:00 |
|
brett
|
849b9bdbb7
|
Requests list now also requires login
|
2017-09-23 10:24:40 +01:00 |
|
Oliver Marks
|
574286e8e3
|
Fix duplicate records in membership table.
|
2017-09-17 10:50:09 +01:00 |
|
Oliver Marks
|
4b3f57ea7e
|
refactored rfid model into user, started on user save form
|
2017-09-14 13:46:54 +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 |
|
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 |
|
Oly
|
985782a3f4
|
move meta tags outside block so they are always available
|
2017-09-12 13:49:09 +01:00 |
|
Oly
|
97e8397d38
|
Added requests to admin area, added meta data to homepage.
|
2017-09-12 13:39:15 +01:00 |
|
Sam Collins
|
da67d703a1
|
Fixed styling on home link
|
2017-09-06 17:35:11 +01:00 |
|
Oly
|
fdef48041d
|
Added title, and changed layout
|
2017-09-06 14:03:02 +01:00 |
|
Oliver Marks
|
fbaa7fb50d
|
implemented django wiki, created requests page, and added to nav
|
2017-09-05 20:07:48 +01:00 |
|
Oly
|
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 |
|
Oly
|
54e1bce190
|
change subscription mechanism to use new gocardless api
|
2017-08-14 14:00:59 +01:00 |
|
Oly
|
3ca6cc4702
|
Fixes #133 Updated blurb on homepage, and amended the about page
|
2017-07-05 13:49:00 +01:00 |
|
Oliver Marks
|
22cd6c2397
|
Add refresh subscription button to admin backend
|
2017-04-23 10:39:04 +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 |
|
Sam Collins
|
488ea1ad4d
|
Added description for category on blog list and fixed single post
|
2017-03-29 20:27:51 +01:00 |
|
Sam Collins
|
eb46f9fcb3
|
Switched to thumbnail images in post list view
|
2017-03-29 19:49:36 +01:00 |
|
Sam Collins
|
c1f6d3f22e
|
Switched to class based views for blog
|
2017-03-22 23:47:14 +00:00 |
|
Sam Collins
|
12e308e927
|
Updated Schema to include url for contact
|
2017-03-15 18:33:37 +00:00 |
|
Sam Collins
|
423adfb7b6
|
Fixed missing div in footer
|
2017-03-15 17:49:44 +00:00 |
|
Sam Collins
|
b31d6397e6
|
Improved page styling for members page
|
2017-03-15 09:01:42 +00:00 |