reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity
1850 commits 2 branches 0 tags 164 MiB
Commit graph

1072 commits

Author SHA1 Message Date
Víðir Valberg Guðmundsson 59cde9163f Use a modelformset for the order detail view to be able to validate stock on updates of quantities and payment of the order. 2019-03-27 22:53:23 +01:00
Víðir Valberg Guðmundsson 6a1103256a Add missing migration from adding ordering to Token model. 2019-03-27 20:25:41 +01:00
Víðir Valberg Guðmundsson 101cb2db63 Check stock when incrementing orderproduct quantity. 2019-03-27 20:25:06 +01:00
Víðir Valberg Guðmundsson 8a5b2e5ed1 Add a worker to cancel old orders. 2019-03-27 13:49:46 +01:00
Víðir Valberg Guðmundsson 39383e0acb Check for orders which are cancelled=False instead of those who are paid to avoid "overselling". 2019-03-27 12:57:50 +01:00
Víðir Valberg Guðmundsson 707eeb9190 Segment tokens by camps. 2019-03-27 12:33:14 +01:00
Víðir Valberg Guðmundsson 96978f4223 Add an extra warning about not being able to access account if losing 2fa device. 2019-03-27 09:56:41 +01:00
Víðir Valberg Guðmundsson 5db3b8bf23 Fix some minor visual things. 2019-03-27 09:51:48 +01:00
Víðir Valberg Guðmundsson 313ce98f8a Missing migration from when we added the date format. 2019-03-27 09:36:42 +01:00
Víðir Valberg Guðmundsson ebb08d1c4f Differentiating between account and profile actually makes sense, @flummer convinced me. 2019-03-27 09:27:57 +01:00
Víðir Valberg Guðmundsson f220d1d4b7 Rearrange and emphasize a bit. 2019-03-26 22:31:39 +01:00
Víðir Valberg Guðmundsson 4ae94cb4d5 Give backup tokens some love. 2019-03-26 22:29:26 +01:00
Víðir Valberg Guðmundsson 8674029c5c I mean like really consistent. 2019-03-26 22:00:17 +01:00
Víðir Valberg Guðmundsson 241bc650b3 Be consistent about calling it profile and not account. 2019-03-26 21:58:15 +01:00
Víðir Valberg Guðmundsson bda1d77275 Forgot about credit notes. 2019-03-26 21:39:44 +01:00
Víðir Valberg Guðmundsson 0b2075425e Keep view code in the respective apps, implement the template in the profiles app. 2019-03-26 21:22:54 +01:00
Víðir Valberg Guðmundsson 50d40eb7df Add token finds list as something the profiles app decides how to show. 2019-03-26 13:39:09 +01:00
Víðir Valberg Guðmundsson b3a7825b56 Some adjustments, 2019-03-26 13:24:23 +01:00
Víðir Valberg Guðmundsson 8c4d99d9e8 Big big overhaul. 2019-03-26 12:14:54 +01:00
Víðir Valberg Guðmundsson 8025303b57 Profile page makeover, initial stuff. 2019-03-26 10:22:27 +01:00
Víðir Valberg Guðmundsson 9f49610013 Fixing urls. 2019-03-26 09:53:06 +01:00
Víðir Valberg Guðmundsson 563bd8a59d Merge branch 'master' into 2-factor-auth 2019-03-26 09:46:04 +01:00
Víðir Valberg Guðmundsson b6052ca89a Make start and end nonnull. 2019-03-18 23:54:06 +01:00
Víðir Valberg Guðmundsson 8143e9608c Forgot that there is a timestamp method now. 2019-03-18 23:49:51 +01:00
Víðir Valberg Guðmundsson 6ef26243f6 Add start and end to instances and return them as posix. 2019-03-18 23:38:22 +01:00
Víðir Valberg Guðmundsson 0f11a77a92 Add urls to graphql schema. 2019-03-18 22:11:33 +01:00
Víðir Valberg Guðmundsson 6d151b5519 Do commonmark and linkifying the same way with trusted as with untrusted. 2019-03-18 21:39:05 +01:00
Víðir Valberg Guðmundsson eb07af9c39 Add a note about the format for invoice dates for expenses and revnues. Fix #292. 2019-03-18 13:06:34 +01:00
Víðir Valberg Guðmundsson 0611da1645 For some reason pip on our webhost can not find channels-redis 2.3.3, so keeping it at 2.3.2. 2019-03-18 12:11:57 +01:00
Víðir Valberg Guðmundsson 60f2712063 Upgrade a lot of dependencies for good measure. 2019-03-18 11:42:31 +01:00
Víðir Valberg Guðmundsson 31c1f97036 Add event metadata information to non-js event pages. Fix #275. 2019-03-18 10:29:57 +01:00
Víðir Valberg Guðmundsson 8fb9e60601 Add a safety valve for creating tickets when marking an order as paid. Fix #136 2019-03-17 16:28:01 +01:00
Víðir Valberg Guðmundsson 512be60da5 Products can not be handed out if order is not paid. Fix #284. 2019-03-17 15:31:15 +01:00
Thomas Steen Rasmussen a5e67fcb8c remove extra mark_as_cancelled method 2019-03-17 15:21:03 +01:00
Víðir Valberg Guðmundsson ecfe7dc385 Now markdown urls also work. 2019-03-17 15:09:32 +01:00
Thomas Steen Rasmussen 481a7d1a95 add mass order cancel adminaction 2019-03-17 15:04:28 +01:00
Víðir Valberg Guðmundsson 53adb50baf Remove urlize filter from news items, we already have linkified in the commonmark filter. 2019-03-17 14:49:52 +01:00
Víðir Valberg Guðmundsson e3ff8d876e Enable CORS headers for /api/ endpoint. Also upgrade django to 2.1.7. 2019-03-14 12:57:27 +01:00
Víðir Valberg Guðmundsson 222cb74622 Make edit button blue. 2019-03-12 12:12:01 +01:00
Víðir Valberg Guðmundsson 9ff88281da Change team guide template a bit. 2019-03-12 11:29:37 +01:00
Víðir Valberg Guðmundsson 6b5f610d49 Fixed buttons a bit. 2019-03-12 11:18:50 +01:00
Víðir Valberg Guðmundsson 0a3c71337e Merging benjaomings work on team guides. 2019-03-12 11:13:13 +01:00
Víðir Valberg Guðmundsson c51771be6b Merge remote-tracking branch 'origin' into feature/team-guides 2019-03-12 10:58:29 +01:00
Víðir Valberg Guðmundsson 8b45c4629d Add a link to RSS feed. 2019-03-12 10:27:09 +01:00
Víðir Valberg Guðmundsson 92a5f67ae3 Add RSS feed to news. 2019-03-12 10:13:27 +01:00
Víðir Valberg Guðmundsson ed311fe2aa Fix creating an info item for a team. Camp is on team, not info category. 2019-03-12 09:56:27 +01:00
Víðir Valberg Guðmundsson 0f18b5de5c csrf_exempt the api. 2019-03-11 21:27:33 +01:00
Víðir Valberg Guðmundsson d972ef2cef Initial graphql endpoint. Only the program for now. 2019-03-11 20:26:36 +01:00
Víðir Valberg Guðmundsson 0b6cc60bb8 Add duration and notes to event proposal info. 2019-03-10 17:20:08 +01:00
Víðir Valberg Guðmundsson 87a1361172 Fix commonmark template filter to turn urls and emails into clickables. 2019-03-09 15:44:45 +01:00
Thomas Steen Rasmussen 3a84dd62d2 use bleach.linkify to make links in markdown clickable automagically, fixes #64 2019-02-17 17:39:42 +01:00
Thomas Steen Rasmussen 8c9b2d11bf fix expenseadmin 2019-02-10 16:33:05 +01:00
Thomas Steen Rasmussen ad0368f486 make it possible to filter products by category and ticket type, and remove description from product list 2019-02-10 14:53:01 +01:00
Thomas Steen Rasmussen 58d670b57f get websocket scheme from window.location.protocol 2019-01-22 09:01:53 +01:00
Thomas Steen Rasmussen d38453c745 CommonMark -> commonmark rename 2019-01-22 08:57:24 +01:00
Thomas Steen Rasmussen 050540c355 upgrade all pip packages to latest versions 2019-01-21 23:37:55 +01:00
Thomas Steen Rasmussen 3ca3631136 upgrade django, hax 2019-01-21 23:22:30 +01:00
Thomas Steen Rasmussen 58f3035927 switch from ws:// to wss:// 2019-01-21 20:06:52 +01:00
Thomas Steen Rasmussen b8fb36d346 add reimbursement_user to description of expense 2019-01-20 17:15:33 +01:00
Thomas Steen Rasmussen c93b38a98b make invoice_date a datefield not a datetimefield 2019-01-20 16:42:50 +01:00
Thomas Steen Rasmussen d14708bee1 add invoice_date to django admin list display 2019-01-20 15:58:10 +01:00
Thomas Steen Rasmussen 51f8854a6c show user on expense and revenue list and detail views 2019-01-20 15:50:54 +01:00
Thomas Steen Rasmussen 864a7e6673 add invoice_date to revenue and expense forms and templates 2019-01-20 15:39:59 +01:00
Thomas Steen Rasmussen e8edb24233 add invoice_date field to Expense and Revenue models 2019-01-20 15:33:05 +01:00
Thomas Steen Rasmussen 29c468ab4a show 2018 and 2019 in the camp menu dropdown 2019-01-20 09:47:47 +01:00
Thomas Steen Rasmussen 090a3b1e28 show both users on reimbursements 2019-01-20 09:38:18 +01:00
Thomas Steen Rasmussen b4698f3fdc fix case sensitive irc channel uniqueness check 2019-01-19 14:22:30 +01:00
Thomas Steen Rasmussen 1b9566ee02 make channel uniqueness check case insensitive 2019-01-19 13:49:51 +01:00
Thomas Steen Rasmussen acfe658ab6 update location on frontpage 2019-01-13 17:21:57 +01:00
Thomas Steen Rasmussen 5e95133267 update help_text on a reimbursement field, and count reimbursement total with the right user field 2018-11-20 18:36:06 +01:00
Thomas Steen Rasmussen 733731ecf9 take camp into account when showing economy stats 2018-11-20 18:14:16 +01:00
Thomas Steen Rasmussen fd1850dd98 use psycopg2-binary and close #271 2018-11-20 17:24:19 +01:00
Thomas Steen Rasmussen a057bd6464
Revenue and economy revamp (#285) 
* rework economy stuff, add revenue model, unfinished code!

* part 2 of economy overhaul. add views for dealing with revenue. rework expense views.
 2018-11-20 17:12:32 +01:00
Thomas Steen Rasmussen a8051783cb upgrade requests due to vulnerability 2018-11-20 17:11:50 +01:00
Thomas Steen Rasmussen 9f28435256 upgrade django 2018-11-20 01:09:27 +01:00
Víðir Valberg Guðmundsson 0a81a88e93 Introduce wrapt and monkeypatch django.views.View so we have a setup method to override. (#279) 2018-11-20 00:22:43 +01:00
Thomas Flummer 9b2640ea07 changed sponsor logo to be filename only (#280) 
* changed sponsor logo to be filename only

fixes issue #151

* changed to load logo correctly on sponsor tickets

related to fix of issue #151
 2018-11-20 00:20:37 +01:00
Thomas Flummer 95cd376f36 added danish bank transfer info (#281) 
fixes issue #237
 2018-11-20 00:19:32 +01:00
Thomas Flummer aafe9de44e added a bit more margin in the botton to prevent footer from covering stuff on mobile devices (#282) 
fixes issue #228
 2018-11-20 00:18:14 +01:00
Thomas Steen Rasmussen 16a838a3cf upgrade django 2018-10-03 23:41:18 +02:00
Thomas Steen Rasmussen 348c73323d make sure expense attachments open in a new window 2018-09-16 11:23:32 +02:00
Thomas Steen Rasmussen 794e905050 show both user and reimbursement_user for reimbursements 2018-09-13 14:09:17 +02:00
Thomas Steen Rasmussen ffe2fc056a show the correct name when creating reimbursement 2018-09-13 13:53:49 +02:00
Thomas Steen Rasmussen 3bd821373f make CampRedirectView handle cases where there is no next or no previous camp with a bit more grace 2018-09-13 13:42:31 +02:00
Thomas Steen Rasmussen 1cd0551d5e the amount of an expense can NOT be negative 2018-09-01 10:25:45 +02:00
Thomas Steen Rasmussen 4123c2eb91 clarify that expense amount can be negative 2018-09-01 09:56:22 +02:00
Víðir Valberg Guðmundsson 4c124a978d
Upgrade django to newest bugfix version 
https://docs.djangoproject.com/en/2.1/releases/2.1.1/
 2018-08-31 11:41:49 +02:00
Thomas Steen Rasmussen ac54e4cb16 show unapproved expenses seperately in backoffice, crosslink expenses and reimbursements in list and detailviews on main page and in backoffice 2018-08-30 19:32:23 +02:00
Thomas Steen Rasmussen 698beaaffd refactor email functionality into seperate functions in economy.email module 2018-08-30 17:54:31 +02:00
Thomas Steen Rasmussen 8d32170422 derive mimetype from attachment content rather than hardcoding application/pdf as we've done until now (we have non-pdf attachments going to economic now) 2018-08-30 17:32:24 +02:00
Thomas Steen Rasmussen 435f95b70b only use base filename, not full path lol 2018-08-30 17:31:43 +02:00
Thomas Steen Rasmussen b753d05b5c include expense uuid in subject of email to economic 2018-08-30 15:22:23 +02:00
Thomas Steen Rasmussen fca7bd3721 filter on reimbursement_user not user 2018-08-30 13:24:23 +02:00
Thomas Steen Rasmussen b56b9c27b4 include the actual attachment when sending to e-conomic 2018-08-30 13:17:52 +02:00
Thomas Steen Rasmussen db73051a23 enable admin for Reimbursement model 2018-08-30 13:17:34 +02:00
Thomas Steen Rasmussen fc3a993547 do not show the expense which represents the actual reimbursement, and do not count it towards the total 2018-08-30 12:39:43 +02:00
Thomas Steen Rasmussen 93b0bff50b permit PDF as well as images for invoice uploads for expenses 2018-08-30 12:18:56 +02:00
Thomas Steen Rasmussen ed736938cc small markup fix 2018-08-30 01:42:45 +02:00
Thomas Steen Rasmussen 4d6a69d50a remove stray pk_url_kwarg 2018-08-30 01:40:39 +02:00
Thomas Steen Rasmussen 8b3e00d9d4 make it impossible for users to approve expenses they submitted themselves 2018-08-30 01:35:37 +02:00
Víðir Valberg Guðmundsson b2fa1dc92c WIP Reimbursement feature (#278) 
* Almost done, need the send to economic part.

* Add a way to approve/reject an reimbursement and send mails accordingly.

* finish work on custom invoice address

* add textfield notes to Order for internal orga notes about the order

* Almost done, need the send to economic part.

* Add a way to approve/reject an reimbursement and send mails accordingly.

* economy commit of doom.. replace reimbursement app with an economy app, add Expense and Reimbursement models, add management of expenses and reimbursements to backoffice. Rework and cleanup permissions stuff, add Camp.Permissions pseudo model to hold all our non-model permissions. still experimental, expect rough edges, but basic functionality should work.
 2018-08-30 00:52:32 +02:00
Thomas Steen Rasmussen 2c1e5f12fe add textfield notes to Order for internal orga notes about the order 2018-08-27 12:44:53 +02:00
Thomas Steen Rasmussen f396708156 finish work on custom invoice address 2018-08-27 11:52:42 +02:00
Víðir Valberg Guðmundsson 80e9c01f87
Merge pull request #277 from pwelzel/feature_custom_invoice_address 
add custom address field to shop.models.Order and invoice template
 2018-08-22 19:27:23 +02:00
Patrick Welzel 8b8191e16d add custom address field to shop.models.Order and invoice template 2018-08-22 15:41:24 +02:00
Thomas Steen Rasmussen af794e6a2f fix dates for 2019 2018-08-22 14:32:10 +02:00
Víðir Valberg Guðmundsson f7d17883be Display feedback a bit better. 2018-08-22 12:59:53 +02:00
Víðir Valberg Guðmundsson 09e916571e Use the existing event type if there is one and one is not defined. 2018-08-21 13:47:56 +02:00
Víðir Valberg Guðmundsson f2b7ad63ca Ooops. 2018-08-20 15:57:00 +02:00
Víðir Valberg Guðmundsson 98433be365 Should be a CampRelatedModel. 2018-08-20 15:52:11 +02:00
Víðir Valberg Guðmundsson 0aa198ba6c Save it! 2018-08-20 15:39:08 +02:00
Víðir Valberg Guðmundsson 2d58695ee4 Adding feedback functionality. 2018-08-20 15:13:51 +02:00
Víðir Valberg Guðmundsson d605abcb40 Use col-xs- instead of col-sm- to get a slightly better dayview. 2018-08-20 12:43:33 +02:00
Víðir Valberg Guðmundsson 2ef3c45bc1 Fix bootstrap script. 2018-08-19 19:52:00 +02:00
Víðir Valberg Guðmundsson b871613d24 Fix proposal submission. 2018-08-19 19:52:00 +02:00
Thomas Steen Rasmussen 52d3e827c8 show a message when all tokens have been found 2018-08-19 18:53:40 +02:00
Thomas Steen Rasmussen 387e4c1d87 filter on the correct id 2018-08-19 18:48:48 +02:00
Thomas Steen Rasmussen a6e12868b3 fix order of columns 2018-08-19 18:35:40 +02:00
Thomas Steen Rasmussen f408b0955a add missing <tr> tags 2018-08-19 18:33:31 +02:00
Thomas Steen Rasmussen fe4fdd06b0 show missing tokens, and show category/hint 2018-08-19 18:30:25 +02:00
Thomas Steen Rasmussen df34d3edf3 add category field, and add unique_together constraint to TokenFind model until I figure out why it is creating duplicates 2018-08-19 17:56:04 +02:00
Víðir Valberg Guðmundsson 97ba725ba2 Add missing migrations. 2018-08-19 17:40:33 +02:00
Thomas Steen Rasmussen 62d172f6c2 add secret token to base.html 2018-08-19 16:22:02 +02:00
Víðir Valberg Guðmundsson 014e962a3f use .get because it might not be there. 2018-08-19 00:06:25 +02:00
Víðir Valberg Guðmundsson b50f368dea Add a slides field to talk and lightning talk forms. 2018-08-18 20:43:24 +02:00
Víðir Valberg Guðmundsson c8f6f76689 Make email mandatory and show that on the event proposal admin site. 2018-08-18 20:04:15 +02:00
Víðir Valberg Guðmundsson 428cee3cd7 Making event proposal admin slightly better. 2018-08-18 20:04:15 +02:00
Thomas Steen Rasmussen 7dd52c78ee make the colours more visible on the camp list page, set camp colours in bootstrap script, add a light_text property to Camp model 2018-08-18 17:45:33 +02:00
Víðir Valberg Guðmundsson 84fff61ddb Forgot something. 2018-08-18 16:55:33 +02:00
Víðir Valberg Guðmundsson f15f878508 Add a proposal edit permission. 2018-08-18 16:37:20 +02:00
Benjamin Bach 2673cd86e2 Add a development default settings file and modify instructions 2018-08-18 16:02:35 +02:00
Thomas Steen Rasmussen 016bfdc1a1 add secret token game code 2018-08-18 15:26:49 +02:00
Benjamin Bach 0b3d8dafb8 Update psycopg2 to latest version 2018-08-18 15:06:27 +02:00
Víðir Valberg Guðmundsson 1af78e6ff7 Add email to SpeakerProposal and Speaker models. 2018-08-18 14:11:30 +02:00
Víðir Valberg Guðmundsson 83fa993ed1 Show SpeakerProposal email. 2018-08-18 13:36:11 +02:00
Víðir Valberg Guðmundsson b3ef1d7538 Add the ticket to the order admin. 2018-08-17 11:59:28 +02:00
Víðir Valberg Guðmundsson 932d6aaa90 Show only camp bar products. 2018-08-16 18:27:59 +02:00
Víðir Valberg Guðmundsson ff6912fed8 Spice up event instance admin. 2018-08-16 18:25:33 +02:00
Víðir Valberg Guðmundsson 104968ed32 Nor email. 2018-08-16 14:55:29 +02:00
Víðir Valberg Guðmundsson e7fd3d9986 Sponsor ticket has no name. 2018-08-16 14:53:58 +02:00
Víðir Valberg Guðmundsson 9fd5dc27bf User should be superuser to access complete backoffice. 2018-08-15 23:47:25 +02:00
Víðir Valberg Guðmundsson ccfb3d13d0 Fix access to backoffice with infodesk permissions. 2018-08-15 20:53:54 +02:00
Víðir Valberg Guðmundsson c02a80553f Actually use the boolean flag. 2018-08-15 11:48:24 +02:00
Víðir Valberg Guðmundsson 93d6525b29 Add missing non-db migrations. 2018-08-15 11:31:00 +02:00
Víðir Valberg Guðmundsson 47bf0fcdbf Add a command to generate sponsor tickets. 2018-08-15 11:30:42 +02:00
Víðir Valberg Guðmundsson 32f4ae13e3 Add some more ordering to TeamTask. 2018-08-15 00:17:03 +02:00
Víðir Valberg Guðmundsson fc3cc91ad4 Update 2019 logo with new dates. 2018-08-14 21:06:49 +02:00
Víðir Valberg Guðmundsson d9b7668ea8 Comments on tasks. 2018-08-14 20:13:46 +02:00
Víðir Valberg Guðmundsson 3d5645a10e Dumb error. 2018-08-13 19:06:30 +02:00
Víðir Valberg Guðmundsson bd00ae3424 Fix menu in mobile. 2018-08-13 19:00:40 +02:00