 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 |
|
|
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 |
|