oly
/
hackspace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • 4461844a0d Pin draceditor to latest version 1.1.6 pyup-bot 2017-02-28 09:03:35 +0000
  • 312a29e8ee disable redis for now, add markdown tag for blog display Oly 2017-02-28 09:03:01 +0000
  • bb9865cd97 Merge remote-tracking branch 'remotes/origin/draceditor' Oly 2017-02-28 09:02:24 +0000
  • db212d90de enable auth providers Oliver Marks 2017-02-26 20:47:48 +0000
  • 280601f3aa enable image uploader Oliver Marks 2017-02-27 19:33:38 +0000
  • 615514259d implemented for blog as a test Oliver Marks 2017-02-27 19:15:27 +0000
  • 60c3c8ed8e markdownx example Oliver Marks 2017-02-27 19:07:13 +0000
  • c4bfaf01d5 Merge pull request #39 from maidstone-hackspace/pyup-pin-djangorestframework-3.5.4 Oliver Marks 2017-02-26 14:25:40 +0000
  • a3d033bd41 Merge branch 'master' into pyup-pin-djangorestframework-3.5.4 Oliver Marks 2017-02-26 14:25:22 +0000
  • 4f384d51d0 Merge pull request #41 from maidstone-hackspace/pyup-update-sphinx-1.5.1-to-1.5.3 Oliver Marks 2017-02-26 14:23:36 +0000
  • 729eee40f1 Merge pull request #40 from maidstone-hackspace/pyup-pin-django-filter-1.0.1 Oliver Marks 2017-02-26 12:08:14 +0000
  • 892f348023 Fix typo Oliver Marks 2017-02-26 11:32:28 +0000
  • 36b553fc02 Copy the correct file, should be stage not live Oliver Marks 2017-02-26 11:11:16 +0000
  • f837f2229b Add local pip cache to avoid repeating downloads Oliver Marks 2017-02-26 10:03:14 +0000
  • cdb939f233 resolve migratioon conflicts Oliver Marks 2017-02-26 08:48:29 +0000
  • 2b408e3628 Update sphinx from 1.5.1 to 1.5.3 pyup-bot 2017-02-26 08:38:21 +0000
  • bdfc11b209 Pin django-filter to latest version 1.0.1 pyup-bot 2017-02-26 08:38:16 +0000
  • 9c1ca86563 Pin djangorestframework to latest version 3.5.4 pyup-bot 2017-02-26 08:38:06 +0000
  • 9e0ada5f3d Added Auth to Django REST API Sam Collins 2017-02-25 22:04:43 +0000
  • 7453c056ae Removed Refrence to Django Rest Framework Sam Collins 2017-02-25 16:07:37 +0000
  • 9db20fb458 Added Blog and Feeds API Sam Collins 2017-02-25 15:39:57 +0000
  • 6c463d3b86 Added Blog page and views Sam Collins 2017-02-16 23:19:50 +0000
  • a5f0d97d54 First Start of blog system Sam Collins 2017-02-16 00:04:44 +0000
  • c898514110 test stage deploy Oliver Marks 2017-02-25 21:44:19 +0000
  • 5c81755134 Update django-coverage-plugin from 1.4.2 to 1.5.0 pyup-bot 2017-02-24 01:54:28 +0000
  • b1b0899e5a Update django-sass-processor from 0.5.3 to 0.5.4 pyup-bot 2017-02-23 13:23:22 +0000
  • 484199a05a Update django-extensions from 1.7.5 to 1.7.7 pyup-bot 2017-02-24 17:58:33 +0000
  • db5d0ff25b add allowed host for production Oliver Marks 2017-02-25 13:31:44 +0000
  • 4be2c9bf47 update dockerfile with new gunnicorn files Oliver Marks 2017-02-25 12:25:56 +0000
  • 5670dcd446 seperate out gunicorn sockets Oliver Marks 2017-02-25 12:20:34 +0000
  • 1be40b5426 seperrate out gunicorn sockets Oliver Marks 2017-02-25 12:11:49 +0000
  • b8952f6452 remove s from banner model, tweak permissions on gunicorn folder Oliver Marks 2017-02-22 22:45:44 +0000
  • 223de57b6b clean up stage configs, start of live configs Oliver Marks 2017-02-21 19:09:15 +0000
  • 496f6ad8d7 Merge pull request #34 from maidstone-hackspace/pyup-update-boto-2.45.0-to-2.46.1 Oliver Marks 2017-02-21 18:55:28 +0000
  • 6d0e911866 remove duplicated success message Oly 2017-02-21 09:00:54 +0000
  • 5c767e93c7 Update boto from 2.45.0 to 2.46.1 pyup-bot 2017-02-21 02:04:17 +0000
  • 9f28b65a58 change success to be a get instead of an attribute lookup Oliver Marks 2017-02-20 21:31:59 +0000
  • 977ce8ca8b made the return url in the tests more complete, and pass through get params to subscription confirm Oliver Marks 2017-02-20 20:16:12 +0000
  • f993311e7c testing ssh deploy setup Oliver Marks 2017-02-19 18:24:28 +0000
  • bb2e071f44 Merge pull request #32 from maidstone-hackspace/pyup-update-lxml-3.7.2-to-3.7.3 Oliver Marks 2017-02-19 16:41:32 +0000
  • 5c58aff874 Added some tests for subscription sign up, improved drone conf to cache pip packages Oliver Marks 2017-02-19 10:50:17 +0000
  • 905e27a99d Update lxml from 3.7.2 to 3.7.3 pyup-bot 2017-02-18 22:38:59 +0000
  • eac0e88596 implemented cancel subscription, will likely need some more work and testing Oliver Marks 2017-02-16 21:35:46 +0000
  • 5257fcd7c3 Update django-compressor from 2.1 to 2.1.1 (#31) pyup.io bot 2017-02-16 09:54:11 +0100
  • 8fe57a1b85 Merge pull request #21 from maidstone-hackspace/pyup-update-django-braces-1.10.0-to-1.11.0 Oliver Marks 2017-02-15 22:00:24 +0000
  • 59796be336 Merge pull request #22 from maidstone-hackspace/pyup-update-django-anymail-0.7-to-0.8 Oliver Marks 2017-02-15 22:00:13 +0000
  • ad6552fee2 Merge pull request #26 from maidstone-hackspace/pyup-update-django-coverage-plugin-1.3.1-to-1.4.2 Oliver Marks 2017-02-15 21:59:45 +0000
  • bd1f8878ca Merge pull request #30 from maidstone-hackspace/pyup-update-braintree-3.34.0-to-3.35.0 Oliver Marks 2017-02-15 21:59:32 +0000
  • 7e800f4aaf Merge pull request #27 from maidstone-hackspace/pyup-update-flake8-3.2.1-to-3.3.0 Oliver Marks 2017-02-15 21:58:19 +0000
  • cbebaa5731 Update braintree from 3.34.0 to 3.35.0 pyup-bot 2017-02-15 20:59:09 +0000
  • 134a5b0982 remove s3 config from stage Oly 2017-02-15 19:28:59 +0000
  • 17703bcb24 Merge pull request #29 from maidstone-hackspace/style-improvments Oliver Marks 2017-02-15 19:14:30 +0000
  • 38cffd11cb
         Added password reset, cleaned up nav and added mailing list link Sam Collins 2017-02-15 19:11:22 +0000
  • f8729a5453
         Improved Chat page text and added Hangouts link Sam Collins 2017-02-15 18:06:27 +0000
  • e1dc5b2e0f
         Reduced duplicate queries on Home Page and made Copyright year dynamic Sam Collins 2017-02-15 18:05:57 +0000
  • 02f946b7a2 use picture tag for banners, add in image size Oly 2017-02-15 13:53:19 +0000
  • 89ca82c1b9 Merge pull request #13 from maidstone-hackspace/pyup-pin-mock-2.0.0 Oliver Marks 2017-02-14 21:54:56 +0000
  • b9c8081699 Merge pull request #28 from maidstone-hackspace/pyup-pin-libsass-0.12.3 Oliver Marks 2017-02-14 21:54:27 +0000
  • 1e9427d743 Added init file to app root Oliver Marks 2017-02-14 21:52:11 +0000
  • 642cc2c2f3 test fixing drone workspace Oliver Marks 2017-02-14 21:02:45 +0000
  • 3a4e438f31 Better image auto fixtures, now has a fixed larger size Oliver Marks 2017-02-14 20:29:45 +0000
  • 612cd5c779 Banner on homepage now enabled Oly 2017-02-14 14:00:37 +0000
  • 9dcd9d496b banner migrations and admin area enabled Oly 2017-02-14 08:52:06 +0000
  • c38d6916ef missing banner files Oly 2017-02-13 08:48:09 +0000
  • 5b5612d550 Started to implement the homepage banner images Oly 2017-02-10 14:10:54 +0000
  • 87336bc3f5 add node to stage compose file Oliver Marks 2017-02-12 21:50:29 +0000
  • 6bedf06f1b Some styling tweaks on homepage and member list page, spacing and layout Oliver Marks 2017-02-12 10:40:20 +0000
  • 7c2826b0e4 update drone file, no longer trys to build container just uses stop python container for tests Oliver Marks 2017-02-10 18:50:55 +0000
  • 2a9eade76d Implemented payment success and failure urls Oliver Marks 2017-02-09 20:12:59 +0000
  • 6fec0e64bd sass now compiles, cleanup unused files, hooked in sign up form to post to gocardless Oliver Marks 2017-02-08 20:32:42 +0000
  • 691bd1a9d9 tests Oliver Marks 2017-02-07 22:58:49 +0000
  • 0292701721 drone tweak Oliver Marks 2017-02-07 22:33:22 +0000
  • 8c7377242c Pin libsass to latest version 0.12.3 pyup-bot 2017-02-07 20:25:44 +0000
  • fa5359979d started work on the membership signup form Oliver Marks 2017-02-07 20:25:23 +0000
  • e5b97e7304 Update flake8 from 3.2.1 to 3.3.0 pyup-bot 2017-02-07 02:20:48 +0000
  • e92fd52e33 Update django-coverage-plugin from 1.3.1 to 1.4.2 pyup-bot 2017-02-07 02:20:42 +0000
  • 88f5a54bc0 clean up side nav slightly, can now be collapsed Oliver Marks 2017-02-06 21:22:03 +0000
  • 0d538df97e add spacing under introduction Oly 2017-02-06 14:10:35 +0000
  • b55e16009d Email should now send on stage Oliver Marks 2017-02-05 17:04:08 +0000
  • 46502c164a Add django file logging for stage Oliver Marks 2017-02-05 14:22:35 +0000
  • e3d266e539 add gunicorn logging Oliver Marks 2017-02-05 13:58:30 +0000
  • 3d8c6a24a2 stage config, and contact form setup to send email Oliver Marks 2017-02-05 12:59:20 +0000
  • 60030f14cd Integrated feeds on homepage into a new feed Oliver Marks 2017-02-02 19:15:46 +0000
  • cb312b34e5 Merge branch 'master' into pyup-pin-mock-2.0.0 Oliver Marks 2017-02-02 19:01:25 +0000
  • a6d60dae6f Merge pull request #14 from maidstone-hackspace/pyup-pin-braintree-3.34.0 Oliver Marks 2017-02-02 18:59:54 +0000
  • 42e92b4d7f Merge pull request #24 from maidstone-hackspace/pyup-pin-django-sass-processor-0.5.3 Oliver Marks 2017-02-02 18:59:27 +0000
  • 2cf81474b3 Merge pull request #25 from maidstone-hackspace/pyup-pin-django-autofixture-0.12.1 Oliver Marks 2017-02-02 18:59:15 +0000
  • ad301febf6 Demo autofixture integration Oliver Marks 2017-02-02 18:51:54 +0000
  • 9ab45cf078 Pin django-autofixture to latest version 0.12.1 pyup-bot 2017-02-02 17:06:00 +0000
  • 9829e87ca9 add auto fixtures Oly 2017-02-02 17:05:38 +0000
  • 911e55021c Pin django-sass-processor to latest version 0.5.3 pyup-bot 2017-02-02 14:05:42 +0000
  • 9faf03f1e7 initial docker setup for staging now works Oliver Marks 2017-02-01 22:26:13 +0000
  • 8bdd99694a Update django-anymail from 0.7 to 0.8 pyup-bot 2017-02-02 00:24:17 +0000
  • c186ad0572 Update django-braces from 1.10.0 to 1.11.0 pyup-bot 2017-02-01 20:20:17 +0000
  • 411dedf00d clean up refresg commands and start on docker-compose files for stage Oly 2017-02-01 14:01:50 +0000
  • 6fd4a64972 Merge pull request #19 from maidstone-hackspace/postgres-message Oliver Marks 2017-01-31 19:56:10 +0000
  • e94dfbac9c Remove Postgres status message Sam Collins 2017-01-30 23:02:31 +0000
  • 5b223d23cd new command works needs improvement, fix fixtures file thanks for pointing that out @mightyscollins Oliver Marks 2017-01-30 22:39:15 +0000
  • e5c1e15010 more work on payment gateway Oly 2017-01-30 17:08:37 +0000
  • fb271941bb Cleaned up migrations, added refresh subscriptions command to update members status Oly 2017-01-28 22:34:47 +0000