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

Commit Graph

  • bf695f823d Add stage to allowed hosts Oliver Marks 2018-01-23 07:15:19 +0000
  • 8ec2e5cd29 Remove volume causing permission issues Oliver Marks 2018-01-22 22:36:02 +0000
  • 9a25b90f06 remove copy pasta in config Oliver Marks 2018-01-22 21:12:44 +0000
  • 84db2d43d9 Add useful commands to readme, chane ownership of log file Oliver Marks 2018-01-22 21:11:09 +0000
  • 52bab868ff Changes to allow local bucket work inside and outside container Oliver Marks 2018-01-22 14:31:54 +0000
  • 276a87c0b3 Now on the bucket list :) Oliver Marks 2018-01-21 21:06:51 +0000
  • c3f9a377c9 Fixes to make django markdown work with the wiki Oliver Marks 2018-01-20 14:29:04 +0000
  • 61ca8968ae Requests form updated Oliver Marks 2018-01-18 21:44:49 +0000
  • 85dfd065e6 Merge branch 'requests' Oliver Marks 2018-01-18 18:57:08 +0000
  • 7d67e9e9e5 requests wip Oliver Marks 2018-01-17 16:55:56 +0000
  • 67facc06f1 Fix for martor markdown display. Oliver Marks 2018-01-16 22:12:50 +0000
  • 9d50b92f40 Fix up user rfid urls Oliver Marks 2018-01-15 18:32:19 +0000
  • 1fb2b65df2 Added flag to track completed equipment requests Oliver Marks 2018-01-14 18:25:02 +0000
  • afdb834daf Disable django wiki login pages and use the default django pages Oliver Marks 2018-01-06 21:11:58 +0000
  • 9f9f9e4795 Updated draceditor to martor, project was renamed. Oliver Marks 2018-01-06 20:56:10 +0000
  • 8678c06108 Added basic creation and deletion buttons for RFID Sam Collins 2017-10-31 22:42:00 +0000
  • 8a2fa40f04 Change include to use custom django wiki temporarily Oly 2017-10-30 13:41:36 +0000
  • 1c79734832 Merge pull request #166 from Brett78/master Oliver Marks 2017-10-26 07:26:11 +0100
  • 7ce5d0dbbf Added rfid card listing and removed user drop down from rfid create form brett 2017-10-25 20:19:30 +0100
  • 79774498c2 Merge pull request #165 from Brett78/master Oliver Marks 2017-10-20 08:00:36 +0100
  • f9a99ccf47 Merge remote-tracking branch 'origin/master' into issue-153 brett 2017-10-19 21:44:29 +0100
  • ad0fa959fa Added new class to allow request descriptions to span the whole row brett 2017-10-19 20:58:26 +0100
  • 7751f5bfc5 Merge pull request #162 from ridders/master Oliver Marks 2017-10-18 20:19:39 +0100
  • 0f4069a40a Update home.html Simon Ridley 2017-10-18 20:18:29 +0100
  • b7127fbef2 Merge pull request #161 from olymk2/master Oliver Marks 2017-10-14 09:07:35 +0100
  • 1fe57ef0b4 Increase pagination size, and change class from sm-2 to sm-12 Oliver Marks 2017-10-14 09:00:30 +0100
  • 21f25d0aa6 Merge pull request #157 from olymk2/master Oliver Marks 2017-10-11 21:57:51 +0100
  • 95d78225e5 fix duplicate surname on membership card Oliver Marks 2017-10-11 21:56:20 +0100
  • 3c505fd63e Merge pull request #152 from Brett78/issue-137 Oliver Marks 2017-10-08 09:40:23 +0100
  • e586ed772c Added missing migration files for register app brett 2017-10-07 14:20:07 +0100
  • 5acf72a5fa Merge pull request #150 from Brett78/issue-137 Oliver Marks 2017-10-07 13:19:24 +0100
  • 8a3060641c Merge pull request #151 from olymk2/master Oliver Marks 2017-10-07 13:03:53 +0100
  • 9169c0dd52 Fixed amount display so its in pounds not pence, fixed cancel Oliver Marks 2017-10-07 13:00:17 +0100
  • ac133ab67a Removed unnecessary js script brett 2017-10-06 20:26:20 +0100
  • d80138e4ed Completed register app brett 2017-10-06 20:16:34 +0100
  • a6fbe753d5 Merge pull request #149 from boothy060590/issue-146/wiki_alignment_issues_mobile Oliver Marks 2017-10-06 13:54:49 +0100
  • 6524233bd8 Fixed styling issues Lee 2017-10-06 13:52:59 +0100
  • c251621e93
         Fixed bug with urls and blog Sam Collins 2017-10-04 20:28:55 +0100
  • 58fbfc5621 Switched to django celery results database backend Sam Collins 2017-10-04 18:08:09 +0100
  • de4f11878b Merge from upstream/master brett 2017-10-04 17:55:34 +0100
  • bd87789d88 Temp commit for register feature brett 2017-10-04 17:31:16 +0100
  • dae32a0bba Swapped login required decorator for login required mixin brett 2017-10-04 17:26:11 +0100
  • 3c3f5436b4 Handle members group not existing, change update loop it no longer needs to return Oly 2017-10-03 13:49:18 +0100
  • d642109c13 Rework some of the payment sign up system Oliver Marks 2017-10-02 22:38:26 +0100
  • c1ed938b04 Cleanup, and better handling in the cancellation flow more work to come Oliver Marks 2017-10-01 22:59:08 +0100
  • 2e9a428761 Fix replacement error Oliver Marks 2017-10-01 14:12:41 +0100
  • e75fc35db1 Merge branch 'rfid' Oliver Marks 2017-10-01 11:55:31 +0100
  • ec41abfa13 Fix up existing tests Oliver Marks 2017-10-01 11:54:35 +0100
  • bbd72b3a95 Fix up what tests we have so they all pass again Oliver Marks 2017-10-01 11:51:15 +0100
  • 88858b5e95 Merge pull request #144 from Brett78/issue-137 Oliver Marks 2017-09-23 14:53:38 +0100
  • 849b9bdbb7 Requests list now also requires login brett 2017-09-23 10:24:40 +0100
  • 833b08980a Increase decimal places on request form Oliver Marks 2017-09-19 21:24:13 +0100
  • 574286e8e3 Fix duplicate records in membership table. Oliver Marks 2017-09-17 10:50:09 +0100
  • 22a700bc5e Change X-Frame options, and apply styling tweak to wiki preview Oliver Marks 2017-09-16 08:55:58 +0100
  • e01770cd06 Add X frame option for wiki preview Oliver Marks 2017-09-15 23:00:48 +0100
  • ae18e8bf38 Fixes #139 wiki preview error Oliver Marks 2017-09-15 22:34:14 +0100
  • a7a3311f8d Better users generated in test data. Oly 2017-09-15 14:05:22 +0100
  • 02befa5ddb Better test data for rfid system Oliver Marks 2017-09-14 22:03:26 +0100
  • 1734dc3f9c Update test data generation Oliver Marks 2017-09-14 07:29:10 +0100
  • 528ad8cade fixed a few more tests Oly 2017-09-13 14:28:16 +0100
  • c16e9079ca small fixes to wip rfid api Oliver Marks 2017-09-13 07:25:56 +0100
  • ed9958b2ad setting up test data Oly 2017-05-03 14:06:34 +0100
  • 4b3f57ea7e refactored rfid model into user, started on user save form Oliver Marks 2017-04-27 22:21:04 +0100
  • 66e012f994 switched to mapping model, lookup in the api does not yet work Oly 2017-04-27 14:02:33 +0100
  • 54f89e8b5b Basic Working tests to build on Oly 2017-04-26 14:02:26 +0100
  • 48c90c95f5 you can now request a device, thinking we need a mapping table again :p Oly 2017-04-25 14:01:19 +0100
  • 69af967ae6 Initial rfid models, to think about any thoughts ? Oliver Marks 2017-04-09 09:57:23 +0100
  • 28e0cd8f94 Updated notifications and open grpah for forums and wiki, should now email new topics to the mailing list. Oly 2017-09-14 13:34:13 +0100
  • 8c99019476 Added back old password hashing algorithms Sam Collins 2017-09-13 19:37:59 +0100
  • 031a85c9ab Merge branch 'matrix' Oliver Marks 2017-09-12 19:56:05 +0100
  • 79a8faf592 change from svg to png image for og:image meta tag Oliver Marks 2017-09-12 19:48:59 +0100
  • 985782a3f4 move meta tags outside block so they are always available Oly 2017-09-12 13:49:09 +0100
  • 97e8397d38 Added requests to admin area, added meta data to homepage. Oly 2017-09-12 13:37:03 +0100
  • d1d7ae7365 update message text, ignore errors for now Oliver Marks 2017-09-08 21:49:59 +0100
  • 409f6651c3 bump site version to use correct domain Oly 2017-09-08 13:50:22 +0100
  • 80601ce000 matrix tasks for spirit and wiki Oly 2017-09-08 13:35:36 +0100
  • 5e5312fe74 testing new celery task for auto notifications Oly 2017-09-07 14:05:00 +0100
  • da67d703a1 Fixed styling on home link Sam Collins 2017-09-06 17:35:11 +0100
  • fdef48041d Added title, and changed layout Oly 2017-09-06 14:03:02 +0100
  • c2efc2cae0 Fixes #56 use newer password hasher Oly 2017-09-06 09:05:24 +0100
  • fbaa7fb50d implemented django wiki, created requests page, and added to nav Oliver Marks 2017-09-05 20:07:48 +0100
  • 10024c6646 clean static before regenerating Oly 2017-08-23 13:47:55 +0100
  • c741232356 Update text on chat page explaining how to connect Oly 2017-08-23 13:17:54 +0100
  • 10039e0b0e celery integration tasks now working, improved feed image variation rendering Oliver Marks 2017-08-22 22:47:44 +0100
  • 633497be6c celery integration Oliver Marks 2017-08-14 19:10:00 +0100
  • 54e1bce190 change subscription mechanism to use new gocardless api Oly 2017-08-14 14:00:59 +0100
  • b3d580d49c Add missing brackets to as_view, to fix #135 Oliver Marks 2017-07-12 17:56:05 +0100
  • c33f4796cb Merge pull request #94 from maidstone-hackspace/pyup-update-django-environ-0.4.2-to-0.4.3 Oliver Marks 2017-07-05 14:02:39 +0100
  • 88da8cfb07 Merge pull request #97 from maidstone-hackspace/pyup-update-django-redis-4.7.0-to-4.8.0 Oliver Marks 2017-07-05 14:02:14 +0100
  • 8ac2025428 Merge pull request #118 from maidstone-hackspace/pyup-update-django-anymail-0.9-to-0.10 Oliver Marks 2017-07-05 14:01:02 +0100
  • fff460a903 Merge pull request #123 from maidstone-hackspace/pyup-update-gevent-1.2.0-to-1.2.2 Oliver Marks 2017-07-05 14:00:48 +0100
  • 11e4d5667d Merge pull request #119 from maidstone-hackspace/pyup-update-boto-2.46.1-to-2.47.0 Oliver Marks 2017-07-05 13:58:49 +0100
  • 9e11b3361e Merge pull request #106 from maidstone-hackspace/pyup-update-django-debug-toolbar-1.7-to-1.8 Oliver Marks 2017-07-05 13:58:19 +0100
  • d38ccf4ca7 Merge pull request #113 from maidstone-hackspace/pyup-update-coverage-4.3.1-to-4.4.1 Oliver Marks 2017-07-05 13:58:04 +0100
  • b336834c33 Merge pull request #126 from maidstone-hackspace/pyup-update-libsass-0.12.3-to-0.13.2 Oliver Marks 2017-07-05 13:57:41 +0100
  • c9385ebaa1 Merge pull request #130 from maidstone-hackspace/pyup-update-pillow-4.1.0-to-4.2.0 Oliver Marks 2017-07-05 13:57:18 +0100
  • 3ca6cc4702 Fixes #133 Updated blurb on homepage, and amended the about page Oly 2017-07-05 13:36:06 +0100
  • b0bffdc7f3 Merge pull request #108 from maidstone-hackspace/pyup-update-braintree-3.35.0-to-3.37.2 Oliver Marks 2017-07-05 12:59:04 +0100
  • b80c1ff4e2 Merge pull request #127 from maidstone-hackspace/pyup-update-django-test-plus-1.0.17-to-1.0.18 Oliver Marks 2017-07-05 12:58:43 +0100
  • 9ee31d2e0c Merge pull request #129 from maidstone-hackspace/pyup-update-django-extensions-1.7.8-to-1.8.0 Oliver Marks 2017-07-05 12:58:27 +0100