reynir
/
bornhack-website
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity
2,028 Commits 2 Branches 0 Tags 164 MiB
Commit Graph

2028 Commits

Author SHA1 Message Date
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 5fdf0e70e6
Merge pull request #294 from bornhack/profile_page_makeover 
Profile page makeover
 2019-03-26 22:33:01 +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 9ce09ffc3b
Adding Jeppe Ernst to list of contributors 2019-03-26 10:07:13 +01:00
Víðir Valberg Guðmundsson aa704bc4db
Merge pull request #190 from bornhack/2-factor-auth 
2 factor auth
 2019-03-26 09:54:07 +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 ad9c9de600
Merge pull request #291 from bornhack/feature/team-guides 
Feature/team guides
 2019-03-12 11:19:26 +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