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
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
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
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
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
ae18e8bf38
Fixes #139 wiki preview error
2017-09-15 22:34:14 +01:00
Oly
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
Oly
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
Oly
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
Oly
66e012f994
switched to mapping model, lookup in the api does not yet work
2017-09-14 13:46:54 +01:00
Oly
54f89e8b5b
Basic Working tests to build on
2017-09-14 13:46:54 +01:00
Oly
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
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
Oliver Marks
d1d7ae7365
update message text, ignore errors for now
2017-09-08 21:49:59 +01:00
Oly
80601ce000
matrix tasks for spirit and wiki
2017-09-08 13:35:36 +01:00
Oly
5e5312fe74
testing new celery task for auto notifications
2017-09-07 22:03:05 +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
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
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
Oliver Marks
633497be6c
celery integration
2017-08-15 07:26:06 +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
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
Oly
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
Sam Collins
e835ea0c20
Added Image to RSS feed using Yahoo thumbnail standard
2017-04-10 00:05:43 +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
db0c031664
Added Post 404 handling and support for published dates in future
2017-03-22 22:08:49 +00:00
Sam Collins
fcb493d2e3
Made published date editable
2017-03-22 21:21:11 +00:00
Sam Collins
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
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
Sam Collins
7a5d515661
Added fallback images to feed cards
2017-03-15 08:35:26 +00:00
Sam Collins
54c9c8e46b
Made Articles check if the feed is enabled
2017-03-08 18:39:14 +00:00
Oliver Marks
f07bf216b5
set email reply-to as well as from
2017-03-07 20:05:52 +00:00
Oliver Marks
d690737753
some quick fixes for contact form, intro and members page
2017-03-07 19:54:43 +00:00
Oly
de91937ab0
Update intro to resolve #53
2017-03-06 08:37:56 +00:00
Oliver Marks
43d6a1ca62
made the banner text a link
2017-03-04 15:23:32 +00:00
Oly
77e6d589c5
javascript analytics
2017-03-01 13:15:56 +00:00
Oly
3882979af0
add in basic analytics
2017-03-01 09:01:26 +00:00
Sam Collins
c1f806e436
Added SEO Schema and Meta Description
2017-03-01 08:55:15 +00:00
Sam Collins
05d77e7c05
Added blog sitemap
2017-03-01 00:58:58 +00:00
Sam Collins
45c59f0707
Improved Schema notation to hopefully improve SEO
2017-03-01 00:43:51 +00:00
Sam Collins
5d9096a86c
Fixed Feed Styling and improved Responsive Banners
2017-02-28 23:49:56 +00:00
Oliver Marks
b3967e30e1
dont use github for emojis now stored in project, will helpp with ssl
2017-02-28 18:34:14 +00:00
Oly
312a29e8ee
disable redis for now, add markdown tag for blog display
2017-02-28 09:03:01 +00:00
Oliver Marks
280601f3aa
enable image uploader
2017-02-27 19:33:38 +00:00
Oliver Marks
615514259d
implemented for blog as a test
2017-02-27 19:15:27 +00:00
Oliver Marks
60c3c8ed8e
markdownx example
2017-02-27 19:07:13 +00:00
Oliver Marks
cdb939f233
resolve migratioon conflicts
2017-02-26 08:48:29 +00:00
Sam Collins
7453c056ae
Removed Refrence to Django Rest Framework
2017-02-26 08:36:59 +00:00
Sam Collins
9db20fb458
Added Blog and Feeds API
2017-02-26 08:36:59 +00:00
Sam Collins
6c463d3b86
Added Blog page and views
2017-02-26 08:36:59 +00:00
Sam Collins
a5f0d97d54
First Start of blog system
2017-02-26 08:36:59 +00:00
Oliver Marks
b8952f6452
remove s from banner model, tweak permissions on gunicorn folder
2017-02-22 22:45:44 +00:00
Oliver Marks
223de57b6b
clean up stage configs, start of live configs
2017-02-21 19:09:15 +00:00
Oly
6d0e911866
remove duplicated success message
2017-02-21 09:00:54 +00:00
Oliver Marks
9f28b65a58
change success to be a get instead of an attribute lookup
2017-02-20 21:31:59 +00:00
Oliver Marks
977ce8ca8b
made the return url in the tests more complete, and pass through get params to subscription confirm
2017-02-20 20:16:12 +00:00
Oliver Marks
5c58aff874
Added some tests for subscription sign up, improved drone conf to cache pip packages
2017-02-19 10:50:17 +00:00
Oliver Marks
eac0e88596
implemented cancel subscription, will likely need some more work and testing
2017-02-16 21:35:46 +00:00
Sam Collins
38cffd11cb
Added password reset, cleaned up nav and added mailing list link
2017-02-15 19:11:22 +00:00
Sam Collins
f8729a5453
Improved Chat page text and added Hangouts link
2017-02-15 18:06:27 +00:00
Sam Collins
e1dc5b2e0f
Reduced duplicate queries on Home Page and made Copyright year dynamic
2017-02-15 18:05:57 +00:00
Oly
02f946b7a2
use picture tag for banners, add in image size
2017-02-15 13:53:19 +00:00
Oliver Marks
1e9427d743
Added init file to app root
2017-02-14 21:52:11 +00:00
Oliver Marks
3a4e438f31
Better image auto fixtures, now has a fixed larger size
2017-02-14 20:29:45 +00:00