 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
|
afdb834daf
|
Disable django wiki login pages and use the default django pages
|
2018-01-06 21:11:58 +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 |
|
Oly
|
8a2fa40f04
|
Change include to use custom django wiki temporarily
|
2017-10-30 13:41:36 +00:00 |
|
Oliver Marks
|
1c79734832
|
Merge pull request #166 from Brett78/master
Added rfid card listing and removed user drop down from rfid create form
|
2017-10-26 07:26:11 +01:00 |
|
brett
|
7ce5d0dbbf
|
Added rfid card listing and removed user drop down from rfid create form
|
2017-10-25 20:19:30 +01:00 |
|
Oliver Marks
|
79774498c2
|
Merge pull request #165 from Brett78/master
Update requests description CSS
|
2017-10-20 08:00:36 +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 |
|
Oliver Marks
|
7751f5bfc5
|
Merge pull request #162 from ridders/master
Update home.html
|
2017-10-18 20:19:39 +01:00 |
|
Simon Ridley
|
0f4069a40a
|
Update home.html
Alteration to sentence.
|
2017-10-18 20:18:29 +01:00 |
|
Oliver Marks
|
b7127fbef2
|
Merge pull request #161 from olymk2/master
Increase pagination size, and change class from sm-2 to sm-12
|
2017-10-14 09:07:35 +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 |
|
Oliver Marks
|
5acf72a5fa
|
Merge pull request #150 from Brett78/issue-137
User register feature
|
2017-10-07 13:19:24 +01:00 |
|
Oliver Marks
|
8a3060641c
|
Merge pull request #151 from olymk2/master
Fixed amount display so its in pounds not pence, fixed cancel
|
2017-10-07 13:03:53 +01:00 |
|
Oliver Marks
|
9169c0dd52
|
Fixed amount display so its in pounds not pence, fixed cancel
|
2017-10-07 13:00:17 +01:00 |
|
brett
|
ac133ab67a
|
Removed unnecessary js script
|
2017-10-06 20:26:20 +01:00 |
|
brett
|
d80138e4ed
|
Completed register app
|
2017-10-06 20:16:34 +01:00 |
|
Oliver Marks
|
a6fbe753d5
|
Merge pull request #149 from boothy060590/issue-146/wiki_alignment_issues_mobile
Fixed styling issues
|
2017-10-06 13:54:49 +01:00 |
|
Lee
|
6524233bd8
|
Fixed styling issues
|
2017-10-06 13:52:59 +01:00 |
|
Sam Collins
|
c251621e93
|
Fixed bug with urls and blog
|
2017-10-04 20:29:23 +01:00 |
|
Sam Collins
|
58fbfc5621
|
Switched to django celery results database backend
|
2017-10-04 18:23:22 +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 |
|
brett
|
dae32a0bba
|
Swapped login required decorator for login required mixin
|
2017-10-04 17:26:11 +01:00 |
|
Oly
|
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 |
|
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 |
|
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 |