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

1498 commits

Author SHA1 Message Date
Thomas Steen Rasmussen a11cb38471 set creditor and debtor to null=False 2019-03-30 10:45:36 +01:00
Thomas Steen Rasmussen ad256b0df4 add admin links to expense and revenue list and detail templates. Do we have a nicer way of linking to stuff in the admin? 2019-03-30 07:21:11 +01:00
Thomas Steen Rasmussen 3e79567713 add chain&credebtor views to backoffice 2019-03-30 06:54:45 +01:00
Víðir Valberg Guðmundsson 132d65087f
Merge pull request #296 from bornhack/handle_negative_stock 
Fix #263
 2019-03-29 22:24:00 +01:00
Víðir Valberg Guðmundsson e78013c87c Blackness. 2019-03-29 22:19:49 +01:00
Víðir Valberg Guðmundsson 4aad051c72 More tests - and some blackness. 2019-03-29 22:06:52 +01:00
Víðir Valberg Guðmundsson e5e1443218 Running black. 2019-03-29 21:21:24 +01:00
Víðir Valberg Guðmundsson c69bf46255 Adding more tests, finding more errors - again! 2019-03-29 20:58:35 +01:00
Víðir Valberg Guðmundsson 2ce2205bd3 Adding more tests, finding more errors. 2019-03-29 17:06:53 +01:00
Víðir Valberg Guðmundsson 9d97a7184a Make sure we do not get an IntegrityError because we are trying to create a new user with the same username as already created by another factory. 2019-03-29 15:59:07 +01:00
Víðir Valberg Guðmundsson 95dcba3fc3 Actually test this - it returnet False because the form was unbound. 2019-03-29 15:37:08 +01:00
Víðir Valberg Guðmundsson d65624e95b Actually found and error by writing tests! Yay! 2019-03-29 15:21:55 +01:00
Víðir Valberg Guðmundsson 26c2e492c3 Optimize tests a bit. 2019-03-29 12:15:15 +01:00
Víðir Valberg Guðmundsson e745c4097f Actually use codecov. 2019-03-29 12:06:41 +01:00
Víðir Valberg Guðmundsson 32b4cdfbee Adding test for ProductDetailView. 2019-03-29 11:49:04 +01:00
Víðir Valberg Guðmundsson b04e7235d9 Adding a test for the OrderProductRelationForm. 2019-03-29 11:19:31 +01:00
dependabot[bot] b0d4fa8c41
Bump sqlparse from 0.2.4 to 0.3.0 in /src/requirements 
Bumps [sqlparse](https://github.com/andialbrecht/sqlparse) from 0.2.4 to 0.3.0.
- [Release notes](https://github.com/andialbrecht/sqlparse/releases)
- [Changelog](https://github.com/andialbrecht/sqlparse/blob/master/CHANGELOG)
- [Commits](https://github.com/andialbrecht/sqlparse/compare/0.2.4...0.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-28 19:51:12 +00:00
dependabot[bot] 6e5d684291
Bump ipython from 7.3.0 to 7.4.0 in /src/requirements 
Bumps [ipython](https://github.com/ipython/ipython) from 7.3.0 to 7.4.0.
- [Release notes](https://github.com/ipython/ipython/releases)
- [Commits](https://github.com/ipython/ipython/compare/7.3.0...7.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-28 13:37:13 +00:00
dependabot[bot] 5748af7de5
Bump oauthlib from 3.0.0 to 3.0.1 in /src/requirements 
Bumps [oauthlib](https://github.com/oauthlib/oauthlib) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/oauthlib/oauthlib/releases)
- [Changelog](https://github.com/oauthlib/oauthlib/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/oauthlib/oauthlib/compare/v3.0.0...v3.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-28 13:16:23 +00:00
Víðir Valberg Guðmundsson 965c29167d Add coverage checks. 2019-03-28 10:48:07 +01:00
Thomas Steen Rasmussen c432899346 allow blank slugs 2019-03-28 07:16:02 +01:00
Thomas Steen Rasmussen f248a5e0ca Add Chain/Creditor/Debtor support in economy app. Make the Creditor/Debtor FK nullable for now, until we've backfilled Creditors/Debtors on all existing Expenses and Revenues. 2019-03-28 07:04:53 +01:00
Víðir Valberg Guðmundsson 863e089c2b Fix tests. 2019-03-27 23:45:08 +01:00
Víðir Valberg Guðmundsson f708864d14 Bah. 2019-03-27 23:39:42 +01:00
Víðir Valberg Guðmundsson ce4a744da6 No need for this. 2019-03-27 23:37:34 +01:00
Víðir Valberg Guðmundsson 4cbb25a537 Use OrderProductRelationForm to validate stock when adding a new product to order, also make it possible to update the quantity of a product on the product detail page if it is already in the current order. 2019-03-27 23:34:44 +01:00
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
Víðir Valberg Guðmundsson 231f1e54fa Woops, need to use lazy. 2018-08-13 18:59:49 +02:00
Víðir Valberg Guðmundsson 44f4f97101 Add success url to rideshare delete. 2018-08-13 18:56:48 +02:00
Víðir Valberg Guðmundsson 5bd0f38249 Revert to using TZ anyway. Too many problems by disabling it by now. 2018-08-13 18:55:25 +02:00
Víðir Valberg Guðmundsson d7e8e24361 Correct typo. 2018-08-12 22:51:41 +02:00
Víðir Valberg Guðmundsson da639ff4cd Add shortcut to users teams. Add a overview of users shifts, and prevent user from taking a shift which overlaps with one already assigned to the user. 2018-08-12 16:50:53 +02:00
Víðir Valberg Guðmundsson a3bfd85604 Disable timezone support. Everything is in Europe/Copenhagen anyway. 2018-08-11 18:15:19 +02:00
Víðir Valberg Guðmundsson 084782b22d Add channels_redis requirement. 2018-08-10 22:36:28 +02:00
Víðir Valberg Guðmundsson 630b2e55de Re-add CHANNEL_LAYERS settings. 2018-08-10 22:25:50 +02:00
Víðir Valberg Guðmundsson e21f596188 Add a help text to rideshare when field to show format for now. 2018-08-10 19:29:19 +02:00
Víðir Valberg Guðmundsson 426a3f56be
Merge pull request #260 from bornhack/feature/rideshare 
Ridesharing functionality
 2018-08-10 18:47:56 +02:00
Víðir Valberg Guðmundsson b864a2cd56 Adding str representation anyway. 2018-08-10 18:46:54 +02:00
Víðir Valberg Guðmundsson effe016b57 Ensure only the creator of the ride can edit and delete it. 2018-08-10 18:46:35 +02:00
Víðir Valberg Guðmundsson d6321cf5e8 Use list_display instead. 2018-08-10 18:39:21 +02:00
Víðir Valberg Guðmundsson c83ebfed08 Adding admin for rideshare.Ride 2018-08-10 18:37:34 +02:00
Víðir Valberg Guðmundsson 641f4dfc73 Upgrading various dependencies. 2018-08-10 18:02:16 +02:00
Víðir Valberg Guðmundsson 3229838d0a Adding contact options. 2018-08-10 17:41:19 +02:00
Víðir Valberg Guðmundsson 56875732dd Also show location on non-js event detail page. 2018-08-10 16:26:25 +02:00
Víðir Valberg Guðmundsson 5ae96cfa6d Add location to events on schedule. 2018-08-10 16:22:17 +02:00
Víðir Valberg Guðmundsson 72f6d42ee2 Show description for team member for team responsible. 2018-08-10 10:14:03 +02:00
Víðir Valberg Guðmundsson 4043b609fd Model should have a default of false, so things that are not defined as true will default to false. 2018-08-09 15:35:58 +02:00
Víðir Valberg Guðmundsson 0e3e6ae06f Remove "this". 2018-08-09 15:30:24 +02:00
Víðir Valberg Guðmundsson f2c5c26262 Fix video recording field and help text. 2018-08-09 15:28:46 +02:00
Víðir Valberg Guðmundsson 6aa37716d6 Fleshing out some templates. 2018-08-09 14:36:21 +02:00
Víðir Valberg Guðmundsson 6b0bc8b737 Add non-db migration which was forgotten. 2018-08-08 22:36:54 +02:00
Víðir Valberg Guðmundsson 1c8685d15e Initial work on rideshare feature. 2018-08-08 22:19:28 +02:00
Víðir Valberg Guðmundsson badd18cb1b Fix apparently intentional off by one error when creating multiple shifts. 2018-08-08 14:41:20 +02:00
Víðir Valberg Guðmundsson 8076f0c380 Use assign/unassign on button. 2018-08-08 14:37:41 +02:00
Víðir Valberg Guðmundsson ca33f8c5eb Make it possible to drop a shift. 2018-08-08 14:36:31 +02:00
Víðir Valberg Guðmundsson 25f40b381b Fix filter in link to schedule from event list. 2018-08-06 21:11:39 +02:00
Víðir Valberg Guðmundsson 2ac86d661c Forgot a spot. 2018-08-06 10:17:22 +02:00
Víðir Valberg Guðmundsson 88152776e3 Include buildup and teardown in available shifts days. 2018-08-05 18:48:58 +02:00
Víðir Valberg Guðmundsson 86ed7a82e8 Forgot to mark shift views as shift views so the menu pick it up 2018-08-05 18:36:57 +02:00
Víðir Valberg Guðmundsson db5a2e1d92 Hide shifts for non-members. 2018-08-05 18:31:43 +02:00
Víðir Valberg Guðmundsson a33e932858 Small representation fix. 2018-08-05 18:21:30 +02:00
Víðir Valberg Guðmundsson 6593d16966 Merge branch 'master' into feature/shift_planning 2018-08-05 17:46:45 +02:00
Víðir Valberg Guðmundsson e482b63c14 Fixing video icon and using another icon for non-recording. 2018-08-05 12:42:18 +02:00
Víðir Valberg Guðmundsson fe974e469b Show email for users when user is team responsible. 2018-08-05 12:23:33 +02:00
Víðir Valberg Guðmundsson 214026dfd7 Integrate into new teams structure. 2018-08-05 12:18:10 +02:00
Víðir Valberg Guðmundsson f5b80d9ac7 Merge branch 'master' into feature/shift_planning 2018-08-05 11:26:15 +02:00
Víðir Valberg Guðmundsson 2ad0568f64
Merge pull request #257 from bornhack/feature/team_refactor 
Team site refactor
 2018-08-05 11:18:03 +02:00
Thomas Steen Rasmussen 458ce45198 add village gear sections to backoffice 2018-08-05 09:29:58 +02:00
Víðir Valberg Guðmundsson 14c88cc9e4 Update the compiled version of the scedule. 2018-08-05 00:22:16 +02:00
Víðir Valberg Guðmundsson d6a2151cdf Rename placeholder for DateTimeRangeField - it is not the most elegant API to work with. 2018-08-05 00:18:51 +02:00
Víðir Valberg Guðmundsson ddd2d5d5dd Forgot this for previous commit. 2018-08-04 18:24:13 +02:00
Víðir Valberg Guðmundsson df3751ecb8 Remove include since we have everything for tasks in one place now. 2018-08-04 18:13:51 +02:00
Víðir Valberg Guðmundsson a4060c2815 Merge branch 'master' into feature/team_refactor 2018-08-04 18:11:32 +02:00
Thomas Steen Rasmussen 73ec701b06 add when and completed to teamtask model, move task list to an included file 2018-08-04 17:38:09 +02:00
Thomas Steen Rasmussen eb8e548c3f add Meetup eventtype in SpeakerProposalForm and EventProposalForm 2018-08-04 13:54:37 +02:00
Víðir Valberg Guðmundsson da75660f0d Final touches - I think. 2018-08-04 13:45:52 +02:00
Víðir Valberg Guðmundsson d08c299e8d Views can have an indirect relation to a team. 2018-08-04 13:27:05 +02:00
Víðir Valberg Guðmundsson ef4262995f
Merge pull request #256 from fALKENdk/253-change-the-z-index-of-the-menu 
Changed z-index of .sticky
 2018-08-04 13:12:51 +02:00
Thomas Steen Rasmussen eeab018a77 add dansk metal sponsor logo 2018-08-02 09:48:59 +02:00
Kasper Friis Christensen a2b0d2980a Minimized comment size 2018-08-01 21:27:02 +02:00
Kasper Friis Christensen 456d9377a6 Changed z-index of .sticky and added bootstrap z-indexes to bornhack.css as a comment 2018-08-01 21:15:43 +02:00
Stephan Telling d03af1c11e
use django.utils timezone rather than datetime 2018-08-01 12:25:43 +02:00
Stephan Telling e04038e4a0
add backoffice pages for merchandise orders and what merchandise to order 2018-08-01 11:50:16 +02:00
Stephan Telling e2ef635abc
overwrite get_queryset on ProductHandoutView and delete unused imports 2018-08-01 11:33:36 +02:00
Kasper Christensen c8e65b739d
Update bornhack.css 
Made content under "Add to order" in shop items visible on iphone.
 2018-07-31 13:43:39 +02:00
Víðir Valberg Guðmundsson 8f46897f0c Add LetsGo logo. 2018-07-30 13:54:36 +02:00
Thomas Steen Rasmussen b6a2ac07b1 crop pcbway logo a bit 2018-07-30 09:28:10 +02:00
Thomas Steen Rasmussen 6a62624355 add epson logo 2018-07-30 09:16:55 +02:00
Thomas Steen Rasmussen ae14b759fa add pcbway logo 2018-07-27 13:20:24 +02:00
Thomas Steen Rasmussen 6828807f2c forgot to rename variable one place 2018-07-26 21:06:00 +02:00
Thomas Steen Rasmussen 9517fb25ea pass request everywhere it is needed 2018-07-26 15:03:49 +02:00
Thomas Steen Rasmussen 016ac8adac use hasattr() and clean up urls 2018-07-24 19:02:58 +02:00
Víðir Valberg Guðmundsson 02977acd5e Some DRYing. 2018-07-23 23:12:57 +02:00
Víðir Valberg Guðmundsson c68015fe26 Teams detail page was starting to get crowded. This is the start of a mostly visual, but also structural, refactor. 2018-07-22 23:18:50 +02:00
Thomas Steen Rasmussen cf9e9ebd5a remove debug print 2018-07-20 08:04:12 +02:00
Víðir Valberg Guðmundsson 2bdd172b92 Fix multiple shifts create. Add deletion. Add a way to take a shift. 2018-07-19 22:46:26 +02:00
Thomas Steen Rasmussen 11a94b477c redirect to the events list if nothing is scheduled yet 2018-07-18 00:58:33 +02:00
Thomas Steen Rasmussen d46ccc530b handle empty results correctly in CampViewMixin, also add a text to the speaker list page when no speakers are found 2018-07-18 00:46:38 +02:00
Thomas Steen Rasmussen 025692d017 add icons to speaker list page 2018-07-18 00:15:14 +02:00
Thomas Steen Rasmussen a6b0332c9f small visual fixes, headline size and remove a stray </h4> and remove the text-container class from the speaker description markdown 2018-07-17 23:35:10 +02:00
Thomas Steen Rasmussen 00c053829e fix copy paste error which makes urls not be shown on event detail page, and fix headline 2018-07-17 23:27:20 +02:00
Thomas Steen Rasmussen 340a3eb58c only check for pk and slug when relevant 2018-07-17 22:47:14 +02:00
Thomas Steen Rasmussen 32e9b7c40b
Fix urls handling and other stuff (#249) 
* update font-awesome to 5.1 and add fab- and fa-regular icons, fixed #244

* also handle slugs when dealing with SingleObjectMixin CBV views, fixes #248

* add missing trailing slash to bar/menu

* add missing trailing slash on event slugs, fixes #245

* fix a lot of stuff related to proposal URLs. actually display them on speaker and event detail pages. show the urltype icons. better messages on update and delete pages. fix 500 error when reapproving events. fix bug that made urls multiply when reapproving event. fixes #246 and fixes #247
 2018-07-17 22:43:16 +02:00
Víðir Valberg Guðmundsson b602e394fe Fix CampViewMixin to deal properly with multiple camp_filters when dealing with SingleObjectMixin based CBVs 2018-07-17 20:46:30 +02:00
Víðir Valberg Guðmundsson 4f77b21a60 Add a way to create multiple shifts - needs a bit more work though. 2018-07-17 19:28:16 +02:00
Víðir Valberg Guðmundsson 8ac973bc61 Iterate over camo_filter and return the first one that returns results! (#243) 2018-07-16 16:07:38 +02:00
Víðir Valberg Guðmundsson 7f9dfdd6e1
Merge pull request #242 from graffen/saxologo 
Add Saxo Bank logo
 2018-07-13 14:42:03 +02:00
Thomas Steen Rasmussen d3ba04b6f2 fix coinify callbacks by passing request argument to order.mark_as_paid() 2018-07-13 14:38:01 +02:00
Jesper Hess 6737515ad4
Add Saxo Bank logo 2018-07-13 14:36:20 +02:00
Víðir Valberg Guðmundsson c103400046 Enable editing of shifts. With timezone rabbit hole. 2018-07-03 07:15:42 +02:00
Víðir Valberg Guðmundsson 102dfa7330 Initial work on shift planning. 2018-07-02 23:52:52 +02:00
Víðir Valberg Guðmundsson 9bfdc714f0
Merge pull request #222 from bornhack/feature/team_controlled_info 
Make info categories team controlled
 2018-07-01 17:34:22 +02:00
Thomas Steen Rasmussen bf864cb5bd also handle Slacking Off events in EventProposalForm 2018-06-26 23:37:39 +02:00
Thomas Steen Rasmussen 5493dbee47 change proposal status when the submitter adds or updates a URL 2018-06-26 23:37:20 +02:00
Thomas Steen Rasmussen ea2bfc8498 hide action buttons when not on the proposal page 2018-06-26 23:31:56 +02:00
Víðir Valberg Guðmundsson a42e23ebd5 Add slacking off to the if-elif-clause for creating a form for proposals. 2018-06-24 01:02:06 +02:00
Víðir Valberg Guðmundsson 5472dbb4b7 Fix village update view. 2018-06-24 00:41:58 +02:00
Thomas Steen Rasmussen 9bfc206b53 define model on all Village views, remove Villages custom manager 2018-06-21 12:32:02 +02:00
Víðir Valberg Guðmundsson 43f076262b Fix some outstanding issues with the team controlled info categories functionality. 2018-06-21 09:19:09 +02:00
Víðir Valberg Guðmundsson 635e57b7f9
Merge branch 'master' into feature/team_controlled_info 2018-06-21 08:53:47 +02:00
Víðir Valberg Guðmundsson 4c60415336 Make each model which inherit from CampRelatedModel but doesn not have a direct relation, define a camp_filter. (#240) 2018-06-20 22:03:29 +02:00
Thomas Steen Rasmussen b94e737e09 add new bornfiber sponsor logo 2018-06-19 19:24:46 +02:00
Thomas Steen Rasmussen f5be4d68d1 info and shop should use the |trustedcommonmark filter 2018-06-04 08:28:09 +02:00
Thomas Steen Rasmussen 4ad58188b2 change the default for link icons, move import for speakerproposalmodel earlier in dode, and add mark_as_rejected() method on eventproposal model 2018-06-03 23:36:07 +02:00
Thomas Steen Rasmussen 23c42985ae hide url action buttons when not inside the program app, and change urltype icons to include the 'fas' bit of the fontawesome class 2018-06-03 23:34:40 +02:00
Thomas Steen Rasmussen 2305416461 only show tables when at least one proposal is found 2018-06-03 23:24:50 +02:00
Thomas Steen Rasmussen a7a9a24c6c move debug logging so channel messages are not logged, the bot doesn't handle any channel messages anyway and we dont want the data 2018-06-03 22:39:05 +02:00
Thomas Steen Rasmussen 02a7af6303 Make content submission form stuff much nicer. More DRY and more nice. Use one class with a form __init__ kwargs which sets eventtype 2018-06-03 19:41:49 +02:00
Thomas Steen Rasmussen 3180ec457d switch backoffice to use the regular CampViewMixin 2018-06-03 18:33:51 +02:00
Thomas Steen Rasmussen 9c9edff4f7 check for empty duration when cleaning duration field 2018-06-03 17:20:45 +02:00
Thomas Steen Rasmussen 3fb2f44e94 add eventtype icons to event list and event detail views in program 2018-06-03 17:16:35 +02:00
Thomas Steen Rasmussen 64f4eebac3 handle cached_property as well as regular properties in our camp filtering on @property in CampViewMixin 2018-06-03 17:16:00 +02:00
Thomas Steen Rasmussen bff5bb292e add debate as eventtype in bootstrap-devsite, and fix commonmark templatefilter a few places I missed 2018-06-03 16:29:28 +02:00
Thomas Steen Rasmussen 811b8171af working on #232, this commit changes backoffice to be camp specific (although many of the actual functions are camp independent). Add backoffice/mixins.py with BackofficeViewMixin to keep it DRY. Add backoffice views to manage proposals. Move SpeakerProposal and EventProposal detail template to includes to they can be used from backoffice. Rename our commonmark templatetags so the names are more intuitive. 2018-06-03 15:34:04 +02:00
Thomas Steen Rasmussen b34fe62118 small visual fixes, add a button to remove speakerproposal from eventproposal 2018-05-27 17:19:19 +02:00
Thomas Steen Rasmussen 2ba8d153fe fix CFP url on bornhack 2020 frontpage 2018-05-27 16:31:57 +02:00
Thomas Steen Rasmussen 3d100c2f8a hide buttons that modify stuff when CFP is not open or camp is readonly 2018-05-27 16:27:41 +02:00
Víðir Valberg Guðmundsson 183da3d161 Add tagline to small logo for 2018. 2018-05-26 20:22:10 +02:00
Víðir Valberg Guðmundsson 6226417ad7 Fix lookups that were forgotten. 2018-05-26 20:14:48 +02:00
Thomas Steen Rasmussen 8e7dc4f80a move call for sponsors view to the database 2018-05-26 15:22:45 +02:00
Thomas Steen Rasmussen 7d9c730752 remove a couple of mixins that are not needed 2018-05-26 14:53:39 +02:00
Thomas Steen Rasmussen 53fa204455 Merge branch 'master' of github.com:bornhack/bornhack-website 2018-05-26 14:42:28 +02:00
Thomas Steen Rasmussen 9052526264 remove action buttons from proposal list, they can be found in the detail views, helps a lot with the width issues when things have long names 2018-05-26 10:48:38 +02:00
Thomas Steen Rasmussen 24371b629a reenable mails to Content team when speaker/eventproposals are created/updated, change so proposal URLs are opened in new window, add a message in browser when proposals are approved in the admin 2018-05-26 10:24:52 +02:00
Thomas Steen Rasmussen eb807a6853 move call for participation from template to the database, prepare to move call for sponsors in the same way. This commit means we will need to copy the content of the old templates to the prod db after deploy 2018-05-25 14:27:53 +02:00
Thomas Steen Rasmussen 157050d30e make it possible to remove a speakerproposal from an eventproposal, move proposal delete buttons to the proposal detail pages, fix a button here and there 2018-05-24 11:43:46 +02:00
Thomas Steen Rasmussen 1f58471927 default allow_video_recording to checked 2018-05-24 10:23:42 +02:00
Thomas Steen Rasmussen 3e12c98b95 for some reason all our test users were is_staff=True users 2018-05-23 23:34:54 +02:00
Thomas Steen Rasmussen 18c33383b7 add url support for speakerproposals and eventproposals, including new models Url and UrlType. Also switch to Django 2.0 path() syntax in various urls.py files getting rid of a lot of ugly regex \o/ 2018-05-23 23:28:27 +02:00
Víðir Valberg Guðmundsson 5b77cb5aa2 Implement a catchall for the remaining infocategories. 2018-05-20 22:27:41 +02:00
Víðir Valberg Guðmundsson decfa29659 Remove obsolete check. 2018-05-20 22:25:19 +02:00
Víðir Valberg Guðmundsson a8df8f0cee Make team a mandatory field on infocategory.g 2018-05-20 22:11:39 +02:00
Víðir Valberg Guðmundsson 317a1c0b1c Remove camp from infocategory and derive it from team. 2018-05-20 22:10:38 +02:00
Thomas Steen Rasmussen df783168c6 filter speakerproposals by user, and redirect directly to combined submit view if no existing speakerproposals was found 2018-05-20 21:54:36 +02:00
Thomas Steen Rasmussen 1fb4eb7e28 remove help box with status explanations, no room :( 2018-05-20 21:42:11 +02:00
Thomas Steen Rasmussen 84c19d01c1 remove tooltip, add missing update button on speakerproposal detail page 2018-05-20 21:36:33 +02:00
Thomas Steen Rasmussen 4720b34021 link to detail view rather than update view in the tables, shine up the detail views a bit 2018-05-20 21:32:05 +02:00
Thomas Steen Rasmussen 743cf25476 add abstract field for music acts 2018-05-20 21:29:37 +02:00
Thomas Steen Rasmussen 5dc3e17d66 if one or more speakerproposals exist show a list so the user can pick an existing or choose to add a new; use the multimodelform stuff only when the user wants to add a new speakerproposal 2018-05-20 21:11:53 +02:00
Víðir Valberg Guðmundsson 733fdbf4ba Add lists of events/speakers til speaker/event detail template. 2018-05-20 20:53:28 +02:00
Víðir Valberg Guðmundsson c8ab0230cd Add detail view for speaker and event proposals. 2018-05-20 20:29:56 +02:00
Víðir Valberg Guðmundsson b172d678fa Add filter for tracks to the schedule 2018-05-20 20:08:25 +02:00
Víðir Valberg Guðmundsson 03b536ff26 Fix channels consumer for program for the new content flow. 2018-05-20 19:32:51 +02:00
Thomas Steen Rasmussen 039af44a92 new content submission flow monster commit of doom. fixes a large part of #191. Split out /program/ urls into a seperate program/urls.py file in the program: URL namespace. Change call for speakers to call for participation everywhere (I think). Add boolean fields call_for_participation_open and call_for_sponsors_open to Camp model. Switch to font-awesome 5.0.13 and update <i> tags everywhere accordingly. Introduce Tracks so all Events belong to a Track, which in turn belongs to a Camp. Add seperate forms for submitting SpeakerProposals and EventProposals so we can set labels and help_text according to EventType, and remove fields we dont need. Remove Pictures from Speaker and SpeakerProposals, it was almost never used, and was a lot of code/complexity. Remove a few PROPOSAL_STATUS namely DRAFT and MODIFIED_AFTER_APPROVAL to simplify the workflow for submitters. Add description, icon and host_title fields to EventType. Add a CombinedProposalSubmitView which allows users to submit a SpeakerProposal and EventProposal from the same page, introducing a new requirements.txt dependency for django-betterforms==1.1.4. Update bootstrap-devsite to match the new reality. 2018-05-20 18:16:20 +02:00
Víðir Valberg Guðmundsson d3273eb1bb Small fix. 2018-05-20 18:07:42 +02:00
Víðir Valberg Guðmundsson 31f74fa010 Fix stupid mistakes. 2018-05-20 16:43:53 +02:00
Víðir Valberg Guðmundsson 63e34ce387 Food team deals with food. 2018-05-08 17:10:11 +02:00
Víðir Valberg Guðmundsson 650de5c067 Adding "add_teams_to_categories" migration. 2018-05-08 17:06:14 +02:00
Víðir Valberg Guðmundsson 280dd5785f Adding the compiled version of the schedule without speaker pictures. 2018-05-06 22:10:20 +02:00
Víðir Valberg Guðmundsson 91519e8b43 Remove speaker pictures from schedule. 2018-05-06 22:09:19 +02:00
Víðir Valberg Guðmundsson 642c452984 Add option to delete info item. 2018-05-06 21:55:50 +02:00
Stephan Telling 4ad568bb97
update 2018 logo 2018-05-06 20:29:19 +02:00
Stephan Telling 3846ebd3c3
Merge pull request #224 from bornhack/st/add-2020-boilerplate 
add 2020 boilerplate
 2018-05-06 17:06:16 +02:00
Stephan Telling a94eb6b610
fix dates in camp detail for 2019 2018-05-06 17:05:23 +02:00
Stephan Telling 752dcf99f0 show call for sponsors on sponsors page (#223) 2018-05-06 16:36:07 +02:00
Stephan Telling 1198b6c558
add zibra wireless logo 2018-05-06 16:31:47 +02:00
Stephan Telling 789b2b7cc8
fix copy paste errors in 2019 and 2020 camp templates 2018-05-06 15:19:52 +02:00
Stephan Telling 3bc9c36cb0
improve 2019 call for speakers page 2018-05-06 15:11:10 +02:00
Stephan Telling c67feb3d34
add boilerplate for 2020 camp 2018-05-06 15:10:02 +02:00
Víðir Valberg Guðmundsson 9d5a9daab4 Add what team is responsible for a category. 2018-05-06 13:24:20 +02:00
Víðir Valberg Guðmundsson e662064319 Add edit button to info items on the info page. 2018-05-06 13:22:04 +02:00
Víðir Valberg Guðmundsson 025a5f76b7 Change markup for the team detail page for a better overview/seperation. 2018-05-06 12:57:01 +02:00
Víðir Valberg Guðmundsson 92e394cce9 Add creation of info items. 2018-05-05 00:38:32 +02:00
Víðir Valberg Guðmundsson b668ac0694 Reorganize views for better clarity. Add editing capabilities for Info Items. 2018-05-05 00:19:24 +02:00
Víðir Valberg Guðmundsson 735f17b1f1 Add an FK to teams.Team on info.InfoCategory, version control it using django-reversion. 2018-05-04 23:40:43 +02:00
Thomas Steen Rasmussen 12563c890d fix logic in nickserv_username_changed() signal handler, fix wrong comment in irc3module.py 2018-05-02 22:33:54 +02:00
Thomas Steen Rasmussen e652a8156c use the builtin anti flood stuff in irc3 rather than a crude time.sleep() 2018-04-25 00:14:37 +02:00
Víðir Valberg Guðmundsson d8871b871f Merge remote-tracking branch 'origin/master' into add_tests_to_shop 2018-04-24 18:12:10 +02:00
Víðir Valberg Guðmundsson ac68daf0b6 Update admin. Fix some more tests. Add stock info to template. 2018-04-24 18:06:19 +02:00
Víðir Valberg Guðmundsson a250635132 Added the first tests to the project. Using factory_boy for great success. (#219) 2018-04-22 08:31:10 +02:00
Thomas Steen Rasmussen 9b2e164ddb add a backoffice view to approve public credit names, fixes #217 2018-04-22 08:28:46 +02:00
Víðir Valberg Guðmundsson c9ae322025 Added the first tests to the project. Using factory_boy for great success. 2018-04-21 23:06:41 +02:00
Thomas Steen Rasmussen 99e6fa80c5 add a small delay to avoid the bot triggering chanserv flood protection when a channel with a lot of members needs acl fixing, closes #214 I think 2018-04-21 18:03:36 +02:00
Víðir Valberg Guðmundsson 193c182422 Add stock_amount to product and reflect it in product detail template. (#213) 2018-04-21 17:00:39 +02:00
Víðir Valberg Guðmundsson 2eea0acf0e Woops, wrong model. Fix #179. 2018-04-15 19:45:34 +02:00
Víðir Valberg Guðmundsson 5e6ff4e76f Fix #179. 2018-04-15 19:44:14 +02:00
Víðir Valberg Guðmundsson 969e737d3e Add missing migrations (non db stuff). 2018-04-15 19:30:32 +02:00
Víðir Valberg Guðmundsson be7035594f Add created/updated to CreditNote and Invoice admins. Fix #199. 2018-04-15 17:29:24 +02:00
Víðir Valberg Guðmundsson adc0b71b97 Favicon stuff. Fix #211. 2018-04-15 16:47:13 +02:00
Thomas Steen Rasmussen 7a526156c9 remove CHANNELS_LAYERS and move ASGI_APPLICATION to settings.py 2018-04-14 17:30:12 +02:00
Thomas Steen Rasmussen f50f1fe2e0 fixup asgi.py for channels2 goodness 2018-04-14 17:04:21 +02:00
Thomas Steen Rasmussen 63c2f68990 no need for redis as long as we only have one server 2018-04-14 16:26:01 +02:00
Thomas Steen Rasmussen 281dacc3f9 resolve conflicts in teams/models.py 2018-04-14 15:41:27 +02:00
Thomas Steen Rasmussen 3df21f0fcc one more typo fix 2018-04-13 22:31:50 +02:00
Thomas Steen Rasmussen 1604d29771 another typo 2018-04-13 22:12:29 +02:00
Thomas Steen Rasmussen f73c6a1a11 this is a property of team 2018-04-13 22:01:05 +02:00
Thomas Steen Rasmussen 65e225f4b1 another stupid typo 2018-04-13 21:54:24 +02:00
Thomas Steen Rasmussen fa6981ea22 stupid typo 2018-04-13 21:47:36 +02:00
Thomas Steen Rasmussen a978ccb6ea fix the irc acl method, indentation and too early return 2018-04-13 21:29:19 +02:00
Thomas Steen Rasmussen 43aefc880a add a few things to the TeamAdmin 2018-04-13 20:55:25 +02:00
Thomas Steen Rasmussen 4d8b70f278 typo 2018-04-13 20:29:57 +02:00
Thomas Steen Rasmussen 1c4a4dd259 change irc channel stuff so each team can have both a private and a public irc channel, introduce the concept of a volunteer channel which all teammembers of all teams get access to 2018-04-13 20:22:19 +02:00
Víðir Valberg Guðmundsson 4d6caf6947
Merge branch 'master' into django-and-channels-upgrade 2018-04-13 11:19:48 +02:00
Thomas Steen Rasmussen cefdaaea97 add missing migration after text change (noop migration) 2018-04-11 23:05:36 +02:00
Thomas Steen Rasmussen 9951869a49 add a view to re-add IRC ACL if something went wrong the first time, add button on team_detail page to activate it 2018-04-11 10:22:28 +02:00
Thomas Steen Rasmussen fdb22777c4 make it possible to filter TeamMember by Camp in the Admin 2018-04-11 10:21:37 +02:00
Thomas Steen Rasmussen 547b594c8d add a Django Admin link to the menu if the logged-in user is staff 2018-04-11 10:21:09 +02:00
Thomas Steen Rasmussen 2ed19d22dc add method to setup a non-private channel, to be used later when we handle switching channels between private and public 2018-04-10 17:31:22 +02:00
Thomas Steen Rasmussen 9f4df30b50 tell the user to register nickserv account before entering it here 2018-04-10 17:27:44 +02:00
Thomas Steen Rasmussen 9b8e72a3c0 remove debug print and handle creation cases in signal handler 2018-04-09 23:24:36 +02:00
Thomas Steen Rasmussen edcf363027
Merge teamcomms branch. Refactor team app and add events app. 
* Primary commit towards improved team communications. Add new events app to handle team notifications when various events happen, with a Type model which contain event types and a Routing model which controls routing of events to teams. Add shortslug for Camp and Team models. events.handler.py contains the code for sending irc and email notifications for teams. The first two eventtypes have been added in datamigrations, 'ticket_created' and 'public_credit_name_changed', and the tickets and profile apps have been adjusted accordingly. Team IRC channels can be marked as managed and if so the IRC bot will register the team channel with ChanServ if possible. Team IRC channels can be marked as private and the bot will set invite only and maintain an ACL with team members. Users can set their NickServ username in their profile to get on the ACL. Rework all team views and templates. Remove TeamArea model and make Team have an FK to Camp directly. Add docstrings a whole bunch of places. Move signal handlers to apps.py and signal_handlers.py in a few apps. Add basic team mailing list handling, more work to be done. Update bootstrap-devsite script to add more teammembers and add some team event routing for the two eventtypes we have.

* default to the console backend for email unless we specifically ask for realworld email

* fix signal for public_credit_name approval irc message

* fix name display on /people/ page

* fix the text on people pages when all non-responsible team members are anonymous

* handle cases where we fallback to the area responsible properly

* readd removed property, it is used in team_detail view

* make it possible to filter profiles by public_credit_name_approved

* add method for sending IRC messages in ircbot.utils.add_irc_message(), extend periodic bot method to do more than check for outgoing messages so rename it, refactor chanserv and nickserv handling code, create methods to check and join/part IRC channels as needed, maintain channel ACLs for private channels, do not autojoin any channels when instatiating the bot instead rely on the new check_irc_channels() method to join them, rename profile presave signal, add checking for changed nickserv usernames for acl handling, add teammember.irc_channel_acl_ok boolean to track ACL state, add missing help_text properties to TeamMember fields, rename teammember postsave signal, add teammember deleted signal, readd wrongly deleted EnsureTeamMemberResponsibleMixin

* add a few missing early returns
 2018-04-09 23:11:05 +02:00
Víðir Valberg Guðmundsson aae3d7e3c9 Got channels2 working. 2018-04-03 20:52:39 +02:00
Víðir Valberg Guðmundsson ff758b15ff Initial work on uprading. 2018-04-03 18:44:10 +02:00
Thomas Steen Rasmussen 03fc20a459 add missing migrations after cleanup and adding of on_delete to all foreignkeys 2018-03-18 09:07:34 +01:00
Thomas Steen Rasmussen 01a55ae149 make our CampViewMixin also filter if camp happens to be a property and not a real model field 2018-03-04 17:17:57 +01:00
Stephan Telling 3acab3f08c
Merge pull request #203 from bornhack/st/on_delete-foreignkey 
add on_delete to all foreignkeys
 2018-03-04 16:34:42 +01:00
Víðir Valberg Guðmundsson f8c86cac31 Should be team_slug, not slug (#201) 2018-03-04 16:34:10 +01:00
Stephan Telling df5e167376
add on_delete to all foreignkeys 2018-03-04 16:26:35 +01:00
Stephan Telling ba3eaa6546
Merge pull request #202 from bornhack/st/cleanup 
Cleanup
 2018-03-04 16:17:50 +01:00
Thomas Steen Rasmussen 075a43d245 remove irc3 command plugin for now since we are not using it 2018-03-04 16:17:32 +01:00
Stephan Telling 663099a603 cleanup in bar/ 2018-03-04 16:00:30 +01:00
Stephan Telling aaa4df27db cleanup in camps/ 2018-03-04 16:00:30 +01:00
Stephan Telling d20a964793 cleanup in info/ 2018-03-04 16:00:30 +01:00
Stephan Telling f20695094e cleanup in ircbot/ 2018-03-04 16:00:30 +01:00
Stephan Telling e482501d7b cleanup in news/ 2018-03-04 16:00:30 +01:00
Stephan Telling aac89c0a9c cleanup in profiles/ 2018-03-04 16:00:30 +01:00
Stephan Telling f9ba48ddfb cleanup in program/ 2018-03-04 16:00:30 +01:00
Stephan Telling 5bffb9c53a cleanup in villages/ 2018-03-04 16:00:30 +01:00
Stephan Telling 8026dba14f cleanup in sponsors/ 2018-03-04 16:00:30 +01:00
Stephan Telling 488767b4f0 cleanup in shop/ 2018-03-04 16:00:30 +01:00
Stephan Telling bc042a1755
add self to fix reference to team responsible 2018-03-04 15:22:13 +01:00
Stephan Telling 10bd3bdd0d
remove camp from team objects in bootstrap script 2018-03-04 15:18:59 +01:00
Thomas Steen Rasmussen 0c00524570 remove unneeded imports from villages app 2018-03-04 14:46:18 +01:00
Thomas Steen Rasmussen 99cb7f5307 remove unneeded imports from utils app 2018-03-04 14:44:33 +01:00
Thomas Steen Rasmussen afa782b26b remove unneeded imports from tickets app 2018-03-04 14:43:56 +01:00
Thomas Steen Rasmussen bd32595783 remove unneeded imports from teams app 2018-03-04 14:42:57 +01:00
Thomas Steen Rasmussen d140155b63 remove unneeded imports from sponsors app 2018-03-04 14:41:51 +01:00
Thomas Steen Rasmussen 0d47ec5607 remove unneeded imports from people app 2018-03-04 14:39:01 +01:00
Thomas Steen Rasmussen ad9f9d1581 remove unneeded imports from ircbot app 2018-03-04 14:36:52 +01:00
Thomas Steen Rasmussen 81abf8db36 remove unneeded imports from info app 2018-03-04 14:35:27 +01:00
Thomas Steen Rasmussen 9e82013ca0 remove unneeded imports from bornhack app 2018-03-04 14:31:46 +01:00
Thomas Steen Rasmussen 6980f53a96 remove unneeded imports from bar app 2018-03-04 14:31:13 +01:00
Thomas Steen Rasmussen 477177a936 remove unneeded imports from backoffice app 2018-03-04 14:30:27 +01:00
Thomas Steen Rasmussen ee628f4183 move another import 2018-03-04 14:16:22 +01:00
Thomas Steen Rasmussen 0f0794edfa another missing requirement 2018-03-04 13:39:11 +01:00
Thomas Steen Rasmussen 7823317939 add missing imports 2018-03-04 13:29:43 +01:00
Thomas Steen Rasmussen 07b3387831 import later, add missing bit of signal, change model reference in signal connection 2018-03-04 13:19:42 +01:00
Thomas Steen Rasmussen fe4e47edb0 add a related_name for the camp relation for TeamArea, and a teams property to Camp model to make it easier to get all teams under all teamareas, also add exclude=None to the validate_unique call in our CleanedModel class 2018-03-04 12:48:35 +01:00
Thomas Steen Rasmussen 60c4bb49fb Create new CampPropertyListFilter based on admin.SimpleListFilter to use for admin filtering of CampRelatedModels where self.camp is a property instead of a real field. Change the Team models camp field to a property, and make the Team model use the new CampPropertyListFilter in the admin. Change the BaseTicket model to being a CampRelatedModel and add a camp property, also, while here move ticket_created signal to signals.py, connect it in apps.py and rename it to ticket_updated. Change Sponsor model to being a CampRelatedModel and add a camp property. 2018-03-04 12:04:07 +01:00
Thomas Steen Rasmussen 6fe1790e89 spelling 2018-03-04 09:19:16 +01:00
Víðir Valberg Guðmundsson cb0c4d8588 Fix admin for Info. 2018-02-11 17:55:15 +01:00
Víðir Valberg Guðmundsson 2ffcec7bcd Adding 2018 letterheads. 2018-01-10 08:22:52 +01:00
Stephan Telling cdc35eb114
Merge pull request #198 from bornhack/st/fix-174 
work on #174
 2018-01-07 20:15:51 +01:00
Stephan Telling e3ad6c5657
update bootstrap script with better dates 2018-01-07 20:15:09 +01:00
Stephan Telling 328d6aa803
work on #174 2018-01-07 19:59:53 +01:00
Thomas Steen Rasmussen c676abd5cf add missing request argument 2018-01-07 17:36:44 +01:00
Víðir Valberg Guðmundsson 61f7e43bdb Erhm... 2018-01-07 17:20:45 +01:00
Víðir Valberg Guðmundsson 19963db102 Woops, available_in can be null 2018-01-07 17:15:03 +01:00
Stephan Telling f047deba76
place card btn in proper div 2018-01-07 16:43:11 +01:00
Stephan Telling 84f187709b
Merge pull request #193 from bornhack/feature/improve_shop_product_admin 
Adding search and improve stuff on shop product admin.
 2018-01-07 16:00:13 +01:00
Víðir Valberg Guðmundsson 004be0a834 Adding search and improve stuff on shop product admin. 2018-01-07 15:56:52 +01:00
Stephan Telling 590bf9fa65
reenable cardpayment 2018-01-07 15:55:32 +01:00
Jeppe Ernst 69f0c8aabd explain why we decorate /admin login 2017-12-31 00:16:07 +01:00
Jeppe Ernst 456ffa1bea useless/redundant file 
forgot to remove it in the previous commit
 2017-12-28 21:50:48 +01:00
Jeppe Ernst 7c5c8f6ac7 require 2fa for /admin pages 
if the user has enabled 2fa
 2017-12-28 21:37:34 +01:00
Jeppe Ernst f313935e6f initial setup of 2fa 
issues:
* middleware temporarily removed, prevents login
* generated QR code has wrong issuer
* require OTP for /admin login not working (yet)
 2017-12-28 16:22:26 +01:00
Thomas Steen Rasmussen a0c646e1cf polish backoffice part 2 2017-12-12 22:48:45 +01:00
Benjamin Bach ecdc62df7c Add IBAN/SWIFT to custom invoices, bank name in settings - fixes #172 (#187) 2017-12-12 22:16:06 +01:00
Stephan Telling 93a827bf7e mark orders as paid in bootstrap script (#189) 
they are marked as payed such that tickets are generated so we can
design the backoffice$
 2017-12-12 22:13:38 +01:00
Thomas Steen Rasmussen 8595377066 rework backoffice part 1; ticket checkin and badge handout views still need some work 2017-12-12 21:57:17 +01:00
Thomas Steen Rasmussen 0806ff138e typo 2017-12-04 10:49:24 +01:00
Thomas Steen Rasmussen 74729ade14 fixup backoffice handout view a bit 2017-12-04 10:43:25 +01:00
Benjamin Bach 9b9138f08c Adding team guides (markdown text) 2017-11-25 22:35:48 +01:00
Víðir Valberg Guðmundsson 6a082e6b58 Lower the percentage for camp redirect. 2017-11-25 14:54:34 +01:00
Víðir Valberg Guðmundsson d8e7ad2d17 Loewr the percentage for camp redirect. 2017-11-25 14:48:46 +01:00
Víðir Valberg Guðmundsson 22da1cd268 Only responsible people should see the edit task button. 2017-11-25 13:26:09 +01:00
Thomas Steen Rasmussen 4dab2c1a4f create and edit tasks 2017-11-25 13:02:32 +01:00
Víðir Valberg Guðmundsson c20771da8a Fixed some stuff for ya' @tykling 2017-11-24 22:19:17 +01:00
Thomas Steen Rasmussen f725a5c941 more work on tasks 2017-11-24 22:06:23 +01:00
Stephan Telling d028c16966
add teamtasks in bootstrap script 2017-11-24 17:40:10 +01:00
Thomas Steen Rasmussen 142afa5ead add teamtask support 2017-11-23 23:09:14 +01:00
Víðir Valberg Guðmundsson d4265edaa0 Remove docker compose setup, not working optimal. Might return later. 2017-11-23 21:47:10 +01:00
Thomas Steen Rasmussen 2e4a44271d filter unpaid, cancelled and refunded orders from backoffice view 2017-11-23 08:35:30 +01:00
Thomas Steen Rasmussen adbf1f4280 a few more changes to the shop order detail page related to 2017 merch batch 2 sale 2017-11-22 01:10:44 +01:00
Thomas Steen Rasmussen ead22bc0a7 disable credit card payments for now 2017-11-21 18:50:52 +01:00
Thomas Steen Rasmussen 40a76fa986 show in t&c that we only permit card payments on some products 2017-11-14 15:57:55 +01:00
Víðir Valberg Guðmundsson 1d4cfe7927
Merge pull request #182 from bornhack/docker-compose 
Docker compose
 2017-11-05 18:07:31 +01:00
Víðir Valberg Guðmundsson c3ebb6ebd3 Make sure that the enviroment_setting.py file is there. 2017-11-05 17:41:37 +01:00
Víðir Valberg Guðmundsson 44d2ce22ab Got the site up running using docker-compose. Also added a Makefile for convenience. 2017-11-05 17:26:20 +01:00
Stephan Telling 8b25a4ceb4
fix #169 2017-11-05 17:14:34 +01:00
Stephan Telling eb9f531b77
fix #165 2017-11-05 16:13:50 +01:00
Stephan Telling 5dd4eaf7f1
fix #170 2017-11-05 15:29:23 +01:00
Thomas Steen Rasmussen e957942181 remove old has_tickets context_processors 2017-10-04 00:25:19 +02:00
Thomas Steen Rasmussen 66014811a4 remove the old Ticket model, move irc notification signal handler to the new Tickets app, various cleanup, fixes #168 2017-10-04 00:06:49 +02:00
Thomas Steen Rasmussen e0e65212bc mark orderproductrelations as handed_out=True when Ticket objects have been created 2017-10-03 23:45:22 +02:00
Thomas Steen Rasmussen c914c23117 add datatables.net jquery table plugin to infodesk page 2017-10-03 23:09:11 +02:00
Thomas Steen Rasmussen 803c8c7ff3 Backoffice first steps + add 403.html (#173) 
* start working on backoffice

* add 403.html
 2017-10-03 21:14:07 +02:00
Vidir Valberg Gudmundsson a4930af92a Removed svgs (which are now in assets repo). 2017-10-01 16:56:36 +02:00
Thomas Steen Rasmussen 7eb8d2d6d2 copy paste error 2017-09-17 15:27:47 +02:00
Thomas Steen Rasmussen d14d67496d add danish_vat field to creditnote model and template 2017-09-17 15:00:38 +02:00
Thomas Steen Rasmussen 0064d69d90 maintain linebreaks in customer info in credit notes 2017-09-17 14:40:05 +02:00
Thomas Steen Rasmussen 88cb7934c1 only send to customer for credit notes linked to a user object 2017-09-17 14:32:21 +02:00
Thomas Steen Rasmussen c0f2478819 add customer field to credit notes for when they are not related to a user directly 2017-09-17 14:20:21 +02:00
Vidir Valberg Gudmundsson 7cf8085829 Fix #161. 2017-09-16 21:29:44 +02:00
Thomas Steen Rasmussen ae0571bece redo logo 2017-09-16 10:13:17 +02:00
Thomas Steen Rasmussen e3e574298e limit sponsor images to 300px wide 2017-09-16 10:08:23 +02:00
Thomas Steen Rasmussen 0a049b3b6d add logo for bornholmske spritfabrikker 2017-09-16 09:59:29 +02:00
Thomas Steen Rasmussen c2cfc0cdb4 add updated to list view 2017-09-14 22:58:45 +02:00
Thomas Steen Rasmussen 21184c9c67 add created and updated to order list and detail 2017-09-14 22:52:08 +02:00
Thomas Steen Rasmussen 4c621aed4b make it possible to have customorders and invoices without Danish VAT 2017-09-14 21:02:59 +02:00
Víðir Valberg Guðmundsson a1f30ccad5 Merge pull request #158 from reynir/ical-abstract-description 
Add event abstract to iCal
 2017-09-12 22:58:31 +02:00
Reynir Björnsson 68cba4659a Add event abstract to iCal 
Testing, what is testing?!
 2017-09-02 00:50:45 +02:00
Benjamin Bach a93a66b8ac Should set mapping to empty dict, not empty string 
asgi_layer = backend_class(**config)
TypeError: type object argument after ** must be a mapping, not str
 2017-08-28 21:56:58 +02:00
Benjamin Bach ceef9bbd55 Calling manage outside of src/ 2017-08-28 21:54:04 +02:00
Vidir Valberg Gudmundsson ee4c0819e4 Order categories and products alphabetically. 2017-08-26 20:28:11 +02:00
Vidir Valberg Gudmundsson 9be3e62842 Hiding sidebars. 2017-08-26 17:34:14 +02:00
Vidir Valberg Gudmundsson 3f18b59a6b HACKER THEME! 2017-08-26 17:31:46 +02:00
Vidir Valberg Gudmundsson 84672dff7c Smaller text! 2017-08-26 17:27:24 +02:00
Vidir Valberg Gudmundsson 2341658e59 Reload every 5 seconds. 2017-08-26 16:11:45 +02:00
Vidir Valberg Gudmundsson 3c83a6f70d Adding title and only showing products in stock. 2017-08-26 16:03:26 +02:00
Vidir Valberg Gudmundsson a9f1e4553b Initial bar app. 2017-08-26 03:49:30 +02:00
Thomas Steen Rasmussen 365827805c check that slugify has returned anything 2017-08-24 20:28:53 +02:00
Thomas Steen Rasmussen 6e3b6002c2 resize logo 2017-08-23 18:32:16 +02:00
Thomas Steen Rasmussen e574f97566 add varnish software sponsor logo 2017-08-23 18:29:24 +02:00
Vidir Valberg Gudmundsson 3885bad0c8 Last minute addition for badge registration. 2017-08-23 12:32:08 +02:00
Thomas Steen Rasmussen f952370280 typo 2017-08-23 03:09:41 +02:00
Thomas Steen Rasmussen ccfdfa1ba5 unfuck name fuck, well done swedes 2017-08-23 03:04:33 +02:00
Vidir Valberg Gudmundsson 3a984acf57 Fixing stuff 2017-08-22 20:09:26 +02:00
Vidir Valberg Gudmundsson 4e036cdbe2 Adding wether ticket is paid or not. 2017-08-22 20:02:17 +02:00
Vidir Valberg Gudmundsson 001bbd5dc0 More ticket admin tweaks. 2017-08-22 19:59:26 +02:00
Vidir Valberg Gudmundsson c0159cfecb Filter by camp. 2017-08-22 19:48:18 +02:00
Vidir Valberg Gudmundsson fabf8959d6 Move checked in to the front. 2017-08-22 19:45:01 +02:00
Vidir Valberg Gudmundsson f06a00db69 Adding search to admin for tickets. 2017-08-22 19:37:02 +02:00
Thomas Steen Rasmussen 65201831da add arrow ecs logo 2017-08-22 19:22:57 +02:00
Vidir Valberg Gudmundsson dd9ef2380a Camp redirect has to account for an ongoing camp. 2017-08-22 14:35:49 +02:00
Vidir Valberg Gudmundsson 385e98d84f Use | as delimiters. 2017-08-22 13:05:49 +02:00
Vidir Valberg Gudmundsson 0cdee23b30 Very basic CSV "export" 2017-08-22 13:00:42 +02:00
Vidir Valberg Gudmundsson 0edcaeb11e Adding inital version of program control center. 2017-08-22 11:48:51 +02:00
Vidir Valberg Gudmundsson 6a413cdd3c Fix too long event titles in day view. 2017-08-21 08:45:05 +02:00
Thomas Steen Rasmussen 659cfd4a37 resize logo 2017-08-20 02:14:35 +02:00
Thomas Steen Rasmussen 4e064967ba add dansk it logo 2017-08-20 02:13:33 +02:00
Thomas Steen Rasmussen c846f4e462 fix logo 2017-08-20 02:07:15 +02:00
Thomas Steen Rasmussen bd01070710 add f-secure logo 2017-08-20 02:00:27 +02:00
Thomas Steen Rasmussen c0d8e22ff6 inherit from CampRelatedModel 2017-08-20 01:05:30 +02:00
Thomas Steen Rasmussen 042a335269 fixup admin for Ticket models 2017-08-20 01:01:44 +02:00
Thomas Steen Rasmussen 3cde4af189 syntax 2017-08-20 00:44:55 +02:00
Thomas Steen Rasmussen ab22a6de4a fix filename in download view too 2017-08-20 00:39:59 +02:00
Thomas Steen Rasmussen c6ee407751 include ticket type in filename 2017-08-20 00:25:48 +02:00
Stephan Telling 3dcb43e575
fix detail template and add text to ticket if checked in 2017-08-20 00:02:05 +02:00
Stephan Telling c0c9e77532 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-08-19 23:53:00 +02:00
Stephan Telling 15cc999e55
fix proper urls for ticket app 2017-08-19 23:49:55 +02:00
Thomas Steen Rasmussen 7f017b416c finally fix qr code method 2017-08-19 23:36:16 +02:00
Thomas Steen Rasmussen 3581e4d32d str() please 2017-08-19 23:30:25 +02:00
Thomas Steen Rasmussen b6c79a9cdd this is a function 2017-08-19 23:27:31 +02:00
Stephan Telling 13efe137b8 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-08-19 23:17:25 +02:00
Thomas Steen Rasmussen 5f4e9d16e9 remove save method frm ShopTicket 2017-08-19 23:14:01 +02:00
Thomas Steen Rasmussen e6ca8a5c71 calculate qrcode_base64 on the fly 2017-08-19 23:10:13 +02:00
Thomas Steen Rasmussen bf56a1624c py3 syntax 2017-08-19 23:01:16 +02:00
Thomas Steen Rasmussen b790b84d6c not so super 2017-08-19 23:00:49 +02:00
Thomas Steen Rasmussen a07e74180e redo migrations for Tickets app again, fix BaseTicket to be abstract 2017-08-19 22:22:54 +02:00
Stephan Telling 984b82ba11
update tickets app with list and detail views 
Also this commit allows users to download their ticket as PDF.
 2017-08-19 22:06:32 +02:00
Thomas Steen Rasmussen 410905f3ce redo migrations completely 2017-08-19 21:33:13 +02:00
Thomas Steen Rasmussen b49ecb87b0 redo migrations for tickets app 2017-08-19 21:27:07 +02:00
Thomas Steen Rasmussen 89aa6bfa22 make baseticket inherit directly from uuidmodel and createdupdatedmodel 2017-08-19 21:11:07 +02:00
Thomas Steen Rasmussen 086578d3b8 show on event list when and if it has any instances 2017-08-19 20:44:07 +02:00
Thomas Steen Rasmussen 8f352d8191 put tickets page under maintenance for now 2017-08-19 12:48:54 +02:00
Stephan Telling 6d5a7522d8
move checked_in field to baseticket 2017-08-18 13:04:13 +02:00
Stephan Telling ac5fb77c7a
update bootstrap script with camps for tickettype 2017-08-17 21:18:43 +02:00
Stephan Telling fc87a13c05
update tickettype with camp, remove camp from baseticket 
minor updates to template and str method of TicketType
 2017-08-17 21:17:36 +02:00
Stephan Telling 85a1db6704
minor tweaks 2017-08-17 21:16:49 +02:00
Stephan Telling 86ec617b71 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-08-17 19:10:20 +02:00
Stephan Telling ec428f78d5
update bootstrap script with tickettypes 2017-08-17 19:09:46 +02:00
Stephan Telling e828bc9c4a Merge pull request #150 from bornhack/tickets 
Tickets
 2017-08-17 18:51:56 +02:00
Stephan Telling eac39352cd
move generate_pdf_letter func to utils app 2017-08-17 18:38:25 +02:00
Stephan Telling ee8c9cf01c
mend 2017-08-17 17:53:45 +02:00
Stephan Telling 5eedb8ff03
update INSTALLED_APPS. add ticket_type and re-add old Ticket model 
also updates bootstrap script with ticket_type
 2017-08-17 17:52:22 +02:00
Stephan Telling bea270f8eb
add new tickets app 2017-08-17 17:51:24 +02:00
Vidir Valberg Gudmundsson 93300f3b30 Change midnight offset from 6 to 9. 2017-08-16 23:05:26 +02:00
Vidir Valberg Gudmundsson 5c9e5482f5 Really fixing bordering events this time. 2017-08-16 22:39:48 +02:00
Vidir Valberg Gudmundsson 99fa18c14d Fix events right up to each other. Unstick sidebar on event detail. 2017-08-16 21:10:27 +02:00
Vidir Valberg Gudmundsson 93ed88d641 Compile! 2017-08-16 19:58:26 +02:00
Vidir Valberg Gudmundsson 8055071b8b Adding ICS button. Make sidebar not sticky. 2017-08-16 19:58:04 +02:00
Vidir Valberg Gudmundsson 25eb491f24 Adding compiled version without debug. 2017-08-16 19:42:20 +02:00
Vidir Valberg Gudmundsson 9659871a3f Fix filter sidebar style. 2017-08-16 19:16:28 +02:00
Vidir Valberg Gudmundsson 08279a479a Latest compiled version with debug. 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson bd1d139d2d Fixing ICSView. 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson 27a4ff0bbb Comitting latest compiled version 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson d44ef3bbd8 Adding small indicators of the number of events instances for the different filters. Resulted in some cleanup as well. 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson 5ce2a59036 Adding lates compiled version. 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson d4d7fad439 Cleanups. Adding Speaker detail. 2017-08-16 18:30:02 +02:00
Vidir Valberg Gudmundsson a447ca476f Working on event detail. Also small visual help in DayView. Also some favorite stuff. 2017-08-16 18:27:28 +02:00