ae1f830785
Simplify config fix wiki styles.
2018-02-03 19:21:12 +00:00
7426c1fb05
Check if banner images are active
2018-01-31 18:22:39 +00:00
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
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
0b2f333ad7
Bootstrap 4 final release update
2018-01-25 14:19:33 +00:00
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
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
985782a3f4
move meta tags outside block so they are always available
2017-09-12 13:49:09 +01:00
97e8397d38
Added requests to admin area, added meta data to homepage.
2017-09-12 13:39:15 +01:00
Oliver Marks
d1d7ae7365
update message text, ignore errors for now
2017-09-08 21:49:59 +01:00
80601ce000
matrix tasks for spirit and wiki
2017-09-08 13:35:36 +01:00
5e5312fe74
testing new celery task for auto notifications
2017-09-07 22:03:05 +01:00
da67d703a1
Fixed styling on home link
2017-09-06 17:35:11 +01:00
fdef48041d
Added title, and changed layout
2017-09-06 14:03:02 +01:00
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
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
Oliver Marks
633497be6c
celery integration
2017-08-15 07:26:06 +01:00
54e1bce190
change subscription mechanism to use new gocardless api
2017-08-14 14:00:59 +01:00
3ca6cc4702
Fixes #133 Updated blurb on homepage, and amended the about page
2017-07-05 13:49:00 +01:00
Oliver Marks
eac7ee9211
Initial version of home page rss.xml feed
2017-06-01 20:30:40 +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
Oliver Marks
42f09e376f
Take redirect url from env file
2017-04-20 20:33:28 +01:00
a6e0bccb25
Changes to fix gocardless payment issue needs a bit more work to fix domain used
2017-04-20 14:23:17 +01:00
Oliver Marks
181cd6dfb7
Fix blog rss image urls to be absolute
2017-04-16 18:35:29 +01:00
e835ea0c20
Added Image to RSS feed using Yahoo thumbnail standard
2017-04-10 00:05:43 +01:00
488ea1ad4d
Added description for category on blog list and fixed single post
2017-03-29 20:27:51 +01:00
eb46f9fcb3
Switched to thumbnail images in post list view
2017-03-29 19:49:36 +01:00
c1f6d3f22e
Switched to class based views for blog
2017-03-22 23:47:14 +00:00
db0c031664
Added Post 404 handling and support for published dates in future
2017-03-22 22:08:49 +00:00
fcb493d2e3
Made published date editable
2017-03-22 21:21:11 +00:00
bd90deccbc
Changed updated date ordering
2017-03-22 16:52:28 +00:00
Oliver Marks
4afc2c2127
put draceditor fork back in to fix a few bugs
2017-03-18 14:17:10 +00:00
12e308e927
Updated Schema to include url for contact
2017-03-15 18:33:37 +00:00
423adfb7b6
Fixed missing div in footer
2017-03-15 17:49:44 +00:00
b31d6397e6
Improved page styling for members page
2017-03-15 09:01:42 +00:00
7a5d515661
Added fallback images to feed cards
2017-03-15 08:35:26 +00:00
54c9c8e46b
Made Articles check if the feed is enabled
2017-03-08 18:39:14 +00:00
Oliver Marks
Oliver Marks