oly
/
hackspace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
140 Commits 1 Branch 0 Tags 5.1 MiB
Commit Graph

140 Commits

Author SHA1 Message Date
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 a20875c3b6 take away redis dependancy 2017-02-28 09:16:33 +00:00
Oly 312a29e8ee disable redis for now, add markdown tag for blog display 2017-02-28 09:03:01 +00:00
Oly bb9865cd97 Merge remote-tracking branch 'remotes/origin/draceditor' 2017-02-28 09:02:24 +00:00
Oliver Marks db212d90de enable auth providers 2017-02-27 20:36:30 +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 c4bfaf01d5 Merge pull request #39 from maidstone-hackspace/pyup-pin-djangorestframework-3.5.4 
Pin djangorestframework to latest version 3.5.4
 2017-02-26 14:25:40 +00:00
Oliver Marks a3d033bd41 Merge branch 'master' into pyup-pin-djangorestframework-3.5.4 2017-02-26 14:25:22 +00:00
Oliver Marks 4f384d51d0 Merge pull request #41 from maidstone-hackspace/pyup-update-sphinx-1.5.1-to-1.5.3 
Update sphinx to 1.5.3
 2017-02-26 14:23:36 +00:00
Oliver Marks 729eee40f1 Merge pull request #40 from maidstone-hackspace/pyup-pin-django-filter-1.0.1 
Pin django-filter to latest version 1.0.1
 2017-02-26 12:08:14 +00:00
Oliver Marks 892f348023 Fix typo 2017-02-26 11:32:28 +00:00
Oliver Marks 36b553fc02 Copy the correct file, should be stage not live 2017-02-26 11:11:16 +00:00
Oliver Marks f837f2229b Add local pip cache to avoid repeating downloads 2017-02-26 10:03:14 +00:00
Oliver Marks cdb939f233 resolve migratioon conflicts 2017-02-26 08:48:29 +00:00
pyup-bot 2b408e3628 Update sphinx from 1.5.1 to 1.5.3 2017-02-26 08:38:21 +00:00
pyup-bot bdfc11b209 Pin django-filter to latest version 1.0.1 2017-02-26 08:38:16 +00:00
pyup-bot 9c1ca86563 Pin djangorestframework to latest version 3.5.4 2017-02-26 08:38:06 +00:00
Sam Collins 9e0ada5f3d Added Auth to Django REST API 2017-02-26 08:36:59 +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 c898514110 test stage deploy 2017-02-25 21:44:19 +00:00
pyup-bot 5c81755134 Update django-coverage-plugin from 1.4.2 to 1.5.0 2017-02-25 16:12:46 +00:00
pyup-bot b1b0899e5a Update django-sass-processor from 0.5.3 to 0.5.4 2017-02-25 16:12:18 +00:00
pyup-bot 484199a05a Update django-extensions from 1.7.5 to 1.7.7 2017-02-25 16:11:58 +00:00
Oliver Marks db5d0ff25b add allowed host for production 2017-02-25 13:31:44 +00:00
Oliver Marks 4be2c9bf47 update dockerfile with new gunnicorn files 2017-02-25 12:25:56 +00:00
Oliver Marks 5670dcd446 seperate out gunicorn sockets 2017-02-25 12:20:34 +00:00
Oliver Marks 1be40b5426 seperrate out gunicorn sockets 2017-02-25 12:11:49 +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
Oliver Marks 496f6ad8d7 Merge pull request #34 from maidstone-hackspace/pyup-update-boto-2.45.0-to-2.46.1 
Update boto to 2.46.1
 2017-02-21 18:55:28 +00:00
Oly 6d0e911866 remove duplicated success message 2017-02-21 09:00:54 +00:00
pyup-bot 5c767e93c7 Update boto from 2.45.0 to 2.46.1 2017-02-21 02:04:17 +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 f993311e7c testing ssh deploy setup 2017-02-19 18:24:28 +00:00
Oliver Marks bb2e071f44 Merge pull request #32 from maidstone-hackspace/pyup-update-lxml-3.7.2-to-3.7.3 
Update lxml to 3.7.3
 2017-02-19 16:41:32 +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
pyup-bot 905e27a99d Update lxml from 3.7.2 to 3.7.3 2017-02-18 22:38:59 +00:00
Oliver Marks eac0e88596 implemented cancel subscription, will likely need some more work and testing 2017-02-16 21:35:46 +00:00
pyup.io bot 5257fcd7c3 Update django-compressor from 2.1 to 2.1.1 (#31) 2017-02-16 08:54:11 +00:00
Oliver Marks 8fe57a1b85 Merge pull request #21 from maidstone-hackspace/pyup-update-django-braces-1.10.0-to-1.11.0 
Update django-braces to 1.11.0
 2017-02-15 22:00:24 +00:00
Oliver Marks 59796be336 Merge pull request #22 from maidstone-hackspace/pyup-update-django-anymail-0.7-to-0.8 
Update django-anymail to 0.8
 2017-02-15 22:00:13 +00:00
Oliver Marks ad6552fee2 Merge pull request #26 from maidstone-hackspace/pyup-update-django-coverage-plugin-1.3.1-to-1.4.2 
Update django-coverage-plugin to 1.4.2
 2017-02-15 21:59:45 +00:00
Oliver Marks bd1f8878ca Merge pull request #30 from maidstone-hackspace/pyup-update-braintree-3.34.0-to-3.35.0 
Update braintree to 3.35.0
 2017-02-15 21:59:32 +00:00
Oliver Marks 7e800f4aaf Merge pull request #27 from maidstone-hackspace/pyup-update-flake8-3.2.1-to-3.3.0 
Update flake8 to 3.3.0
 2017-02-15 21:58:19 +00:00