reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

Commit graph

  • 8143e9608c Forgot that there is a timestamp method now. Víðir Valberg Guðmundsson 2019-03-18 23:49:51 +0100
  • 6ef26243f6 Add start and end to instances and return them as posix. Víðir Valberg Guðmundsson 2019-03-18 23:38:22 +0100
  • 0f11a77a92 Add urls to graphql schema. Víðir Valberg Guðmundsson 2019-03-18 22:11:33 +0100
  • 6d151b5519 Do commonmark and linkifying the same way with trusted as with untrusted. Víðir Valberg Guðmundsson 2019-03-18 21:39:05 +0100
  • eb07af9c39 Add a note about the format for invoice dates for expenses and revnues. Fix #292. Víðir Valberg Guðmundsson 2019-03-18 13:06:34 +0100
  • 0611da1645 For some reason pip on our webhost can not find channels-redis 2.3.3, so keeping it at 2.3.2. Víðir Valberg Guðmundsson 2019-03-18 12:11:57 +0100
  • 60f2712063 Upgrade a lot of dependencies for good measure. Víðir Valberg Guðmundsson 2019-03-18 11:42:31 +0100
  • 31c1f97036 Add event metadata information to non-js event pages. Fix #275. Víðir Valberg Guðmundsson 2019-03-18 10:29:57 +0100
  • 8fb9e60601 Add a safety valve for creating tickets when marking an order as paid. Fix #136 Víðir Valberg Guðmundsson 2019-03-17 16:28:01 +0100
  • 512be60da5 Products can not be handed out if order is not paid. Fix #284. Víðir Valberg Guðmundsson 2019-03-17 15:31:15 +0100
  • a5e67fcb8c remove extra mark_as_cancelled method Thomas Steen Rasmussen 2019-03-17 15:21:03 +0100
  • ecfe7dc385 Now markdown urls also work. Víðir Valberg Guðmundsson 2019-03-17 15:09:32 +0100
  • 481a7d1a95 add mass order cancel adminaction Thomas Steen Rasmussen 2019-03-17 15:04:28 +0100
  • 53adb50baf Remove urlize filter from news items, we already have linkified in the commonmark filter. Víðir Valberg Guðmundsson 2019-03-17 14:49:52 +0100
  • e3ff8d876e Enable CORS headers for /api/ endpoint. Also upgrade django to 2.1.7. Víðir Valberg Guðmundsson 2019-03-14 12:57:27 +0100
  • 222cb74622 Make edit button blue. Víðir Valberg Guðmundsson 2019-03-12 12:12:01 +0100
  • 9ff88281da Change team guide template a bit. Víðir Valberg Guðmundsson 2019-03-12 11:29:37 +0100
  • ad9c9de600
         Merge pull request #291 from bornhack/feature/team-guides Víðir Valberg Guðmundsson 2019-03-12 11:19:26 +0100
  • 6b5f610d49 Fixed buttons a bit. Víðir Valberg Guðmundsson 2019-03-12 11:18:50 +0100
  • 0a3c71337e Merging benjaomings work on team guides. Víðir Valberg Guðmundsson 2019-03-12 11:13:13 +0100
  • c51771be6b Merge remote-tracking branch 'origin' into feature/team-guides Víðir Valberg Guðmundsson 2019-03-12 10:58:29 +0100
  • 8b45c4629d Add a link to RSS feed. Víðir Valberg Guðmundsson 2019-03-12 10:27:09 +0100
  • 92a5f67ae3 Add RSS feed to news. Víðir Valberg Guðmundsson 2019-03-12 10:13:27 +0100
  • ed311fe2aa Fix creating an info item for a team. Camp is on team, not info category. Víðir Valberg Guðmundsson 2019-03-12 09:56:27 +0100
  • 0f18b5de5c csrf_exempt the api. Víðir Valberg Guðmundsson 2019-03-11 21:27:33 +0100
  • d972ef2cef Initial graphql endpoint. Only the program for now. Víðir Valberg Guðmundsson 2019-03-11 20:26:36 +0100
  • 0b6cc60bb8 Add duration and notes to event proposal info. Víðir Valberg Guðmundsson 2019-03-10 17:20:08 +0100
  • 87a1361172 Fix commonmark template filter to turn urls and emails into clickables. Víðir Valberg Guðmundsson 2019-03-09 15:44:45 +0100
  • 3a84dd62d2 use bleach.linkify to make links in markdown clickable automagically, fixes #64 Thomas Steen Rasmussen 2019-02-17 17:39:42 +0100
  • 8c9b2d11bf fix expenseadmin Thomas Steen Rasmussen 2019-02-10 16:33:05 +0100
  • ad0368f486 make it possible to filter products by category and ticket type, and remove description from product list Thomas Steen Rasmussen 2019-02-10 14:53:01 +0100
  • 58d670b57f get websocket scheme from window.location.protocol Thomas Steen Rasmussen 2019-01-22 09:01:53 +0100
  • d38453c745 CommonMark -> commonmark rename Thomas Steen Rasmussen 2019-01-22 08:57:24 +0100
  • 050540c355 upgrade all pip packages to latest versions Thomas Steen Rasmussen 2019-01-21 23:37:55 +0100
  • 3ca3631136 upgrade django, hax Thomas Steen Rasmussen 2019-01-21 23:22:30 +0100
  • 58f3035927 switch from ws:// to wss:// Thomas Steen Rasmussen 2019-01-21 20:06:52 +0100
  • b8fb36d346 add reimbursement_user to description of expense Thomas Steen Rasmussen 2019-01-20 17:15:33 +0100
  • c93b38a98b make invoice_date a datefield not a datetimefield Thomas Steen Rasmussen 2019-01-20 16:42:50 +0100
  • d14708bee1 add invoice_date to django admin list display Thomas Steen Rasmussen 2019-01-20 15:58:10 +0100
  • 51f8854a6c show user on expense and revenue list and detail views Thomas Steen Rasmussen 2019-01-20 15:50:54 +0100
  • 864a7e6673 add invoice_date to revenue and expense forms and templates Thomas Steen Rasmussen 2019-01-20 15:39:59 +0100
  • e8edb24233 add invoice_date field to Expense and Revenue models Thomas Steen Rasmussen 2019-01-20 15:33:05 +0100
  • 29c468ab4a show 2018 and 2019 in the camp menu dropdown Thomas Steen Rasmussen 2019-01-20 09:47:47 +0100
  • 090a3b1e28 show both users on reimbursements Thomas Steen Rasmussen 2019-01-20 09:38:18 +0100
  • b4698f3fdc fix case sensitive irc channel uniqueness check Thomas Steen Rasmussen 2019-01-19 14:22:30 +0100
  • 1b9566ee02 make channel uniqueness check case insensitive Thomas Steen Rasmussen 2019-01-19 13:49:51 +0100
  • acfe658ab6 update location on frontpage Thomas Steen Rasmussen 2019-01-13 17:21:57 +0100
  • 5e95133267 update help_text on a reimbursement field, and count reimbursement total with the right user field Thomas Steen Rasmussen 2018-11-20 18:36:06 +0100
  • 733731ecf9 take camp into account when showing economy stats Thomas Steen Rasmussen 2018-11-20 18:14:16 +0100
  • fd1850dd98 use psycopg2-binary and close #271 Thomas Steen Rasmussen 2018-11-20 17:24:19 +0100
  • a057bd6464
         Revenue and economy revamp (#285) Thomas Steen Rasmussen 2018-11-20 17:12:32 +0100
  • a8051783cb upgrade requests due to vulnerability Thomas Steen Rasmussen 2018-11-20 17:11:50 +0100
  • 9f28435256 upgrade django Thomas Steen Rasmussen 2018-11-20 01:09:27 +0100
  • 0a81a88e93 Introduce wrapt and monkeypatch django.views.View so we have a setup method to override. (#279) Víðir Valberg Guðmundsson 2018-11-20 00:22:43 +0100
  • 9b2640ea07 changed sponsor logo to be filename only (#280) Thomas Flummer 2018-11-20 00:20:37 +0100
  • 95cd376f36 added danish bank transfer info (#281) Thomas Flummer 2018-11-20 00:19:32 +0100
  • aafe9de44e added a bit more margin in the botton to prevent footer from covering stuff on mobile devices (#282) Thomas Flummer 2018-11-20 00:18:14 +0100
  • 9f824ae11a added a bit of information for setting up on macOS (#283) Thomas Flummer 2018-11-20 00:17:17 +0100
  • 16a838a3cf upgrade django Thomas Steen Rasmussen 2018-10-03 23:41:18 +0200
  • 348c73323d make sure expense attachments open in a new window Thomas Steen Rasmussen 2018-09-16 11:23:32 +0200
  • 794e905050 show both user and reimbursement_user for reimbursements Thomas Steen Rasmussen 2018-09-13 14:09:17 +0200
  • ffe2fc056a show the correct name when creating reimbursement Thomas Steen Rasmussen 2018-09-13 13:53:49 +0200
  • 3bd821373f make CampRedirectView handle cases where there is no next or no previous camp with a bit more grace Thomas Steen Rasmussen 2018-09-13 13:42:31 +0200
  • 1cd0551d5e the amount of an expense can NOT be negative Thomas Steen Rasmussen 2018-09-01 10:25:45 +0200
  • 4123c2eb91 clarify that expense amount can be negative Thomas Steen Rasmussen 2018-09-01 09:56:22 +0200
  • 4c124a978d
         Upgrade django to newest bugfix version Víðir Valberg Guðmundsson 2018-08-31 11:41:49 +0200
  • ac54e4cb16 show unapproved expenses seperately in backoffice, crosslink expenses and reimbursements in list and detailviews on main page and in backoffice Thomas Steen Rasmussen 2018-08-30 19:32:23 +0200
  • 698beaaffd refactor email functionality into seperate functions in economy.email module Thomas Steen Rasmussen 2018-08-30 17:54:31 +0200
  • 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) Thomas Steen Rasmussen 2018-08-30 17:32:24 +0200
  • 435f95b70b only use base filename, not full path lol Thomas Steen Rasmussen 2018-08-30 17:31:43 +0200
  • b753d05b5c include expense uuid in subject of email to economic Thomas Steen Rasmussen 2018-08-30 15:22:23 +0200
  • fca7bd3721 filter on reimbursement_user not user Thomas Steen Rasmussen 2018-08-30 13:24:23 +0200
  • b56b9c27b4 include the actual attachment when sending to e-conomic Thomas Steen Rasmussen 2018-08-30 13:17:52 +0200
  • db73051a23 enable admin for Reimbursement model Thomas Steen Rasmussen 2018-08-30 13:17:34 +0200
  • fc3a993547 do not show the expense which represents the actual reimbursement, and do not count it towards the total Thomas Steen Rasmussen 2018-08-30 12:39:43 +0200
  • 93b0bff50b permit PDF as well as images for invoice uploads for expenses Thomas Steen Rasmussen 2018-08-30 12:18:56 +0200
  • ed736938cc small markup fix Thomas Steen Rasmussen 2018-08-30 01:42:45 +0200
  • 4d6a69d50a remove stray pk_url_kwarg Thomas Steen Rasmussen 2018-08-30 01:40:39 +0200
  • 8b3e00d9d4 make it impossible for users to approve expenses they submitted themselves Thomas Steen Rasmussen 2018-08-30 01:35:37 +0200
  • b2fa1dc92c WIP Reimbursement feature (#278) Víðir Valberg Guðmundsson 2018-08-30 00:52:32 +0200
  • 2c1e5f12fe add textfield notes to Order for internal orga notes about the order Thomas Steen Rasmussen 2018-08-27 12:44:53 +0200
  • f396708156 finish work on custom invoice address Thomas Steen Rasmussen 2018-08-27 11:52:42 +0200
  • 80e9c01f87
         Merge pull request #277 from pwelzel/feature_custom_invoice_address Víðir Valberg Guðmundsson 2018-08-22 19:27:23 +0200
  • 8b8191e16d add custom address field to shop.models.Order and invoice template Patrick Welzel 2018-08-22 15:41:24 +0200
  • af794e6a2f fix dates for 2019 Thomas Steen Rasmussen 2018-08-22 14:32:10 +0200
  • f7d17883be Display feedback a bit better. Víðir Valberg Guðmundsson 2018-08-22 12:59:53 +0200
  • 09e916571e Use the existing event type if there is one and one is not defined. Víðir Valberg Guðmundsson 2018-08-21 13:47:56 +0200
  • f2b7ad63ca Ooops. Víðir Valberg Guðmundsson 2018-08-20 15:57:00 +0200
  • 98433be365 Should be a CampRelatedModel. Víðir Valberg Guðmundsson 2018-08-20 15:52:11 +0200
  • 0aa198ba6c Save it! Víðir Valberg Guðmundsson 2018-08-20 15:39:08 +0200
  • 2d58695ee4 Adding feedback functionality. Víðir Valberg Guðmundsson 2018-08-20 15:13:51 +0200
  • d605abcb40 Use col-xs- instead of col-sm- to get a slightly better dayview. Víðir Valberg Guðmundsson 2018-08-20 12:43:33 +0200
  • 2ef3c45bc1 Fix bootstrap script. Víðir Valberg Guðmundsson 2018-08-19 19:51:47 +0200
  • b871613d24 Fix proposal submission. Víðir Valberg Guðmundsson 2018-08-19 18:21:04 +0200
  • 52d3e827c8 show a message when all tokens have been found Thomas Steen Rasmussen 2018-08-19 18:53:40 +0200
  • 387e4c1d87 filter on the correct id Thomas Steen Rasmussen 2018-08-19 18:48:48 +0200
  • a6e12868b3 fix order of columns Thomas Steen Rasmussen 2018-08-19 18:35:40 +0200
  • f408b0955a add missing <tr> tags Thomas Steen Rasmussen 2018-08-19 18:33:31 +0200
  • fe4fdd06b0 show missing tokens, and show category/hint Thomas Steen Rasmussen 2018-08-19 18:30:25 +0200
  • df34d3edf3 add category field, and add unique_together constraint to TokenFind model until I figure out why it is creating duplicates Thomas Steen Rasmussen 2018-08-19 17:56:04 +0200