193e13557f
Bump django-extensions from 2.1.6 to 2.1.9 in /src/requirements
...
Bumps [django-extensions](https://github.com/django-extensions/django-extensions ) from 2.1.6 to 2.1.9.
- [Release notes](https://github.com/django-extensions/django-extensions/releases )
- [Changelog](https://github.com/django-extensions/django-extensions/blob/master/CHANGELOG.md )
- [Commits](https://github.com/django-extensions/django-extensions/compare/2.1.6...2.1.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-11 08:42:50 +00:00
8b58aad273
[Security] Bump django from 2.2.1 to 2.2.2 in /src/requirements
...
Bumps [django](https://github.com/django/django ) from 2.2.1 to 2.2.2. **This update includes security fixes.**
- [Release notes](https://github.com/django/django/releases )
- [Commits](https://github.com/django/django/compare/2.2.1...2.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-10 20:18:29 +00:00
a7147bbed1
Bump requests from 2.21.0 to 2.22.0 in /src/requirements
...
Bumps [requests](https://github.com/requests/requests ) from 2.21.0 to 2.22.0.
- [Release notes](https://github.com/requests/requests/releases )
- [Changelog](https://github.com/kennethreitz/requests/blob/master/HISTORY.md )
- [Commits](https://github.com/requests/requests/compare/v2.21.0...v2.22.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-17 06:55:23 +00:00
0be4a08e93
Bump factory-boy from 2.11.1 to 2.12.0 in /src/requirements
...
Bumps [factory-boy](https://github.com/FactoryBoy/factory_boy ) from 2.11.1 to 2.12.0.
- [Release notes](https://github.com/FactoryBoy/factory_boy/releases )
- [Changelog](https://github.com/FactoryBoy/factory_boy/blob/master/docs/changelog.rst )
- [Commits](https://github.com/FactoryBoy/factory_boy/compare/2.11.1...2.12.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-13 06:47:57 +00:00
7ed9bec954
New logo on 2019 frontpage ( #322 )
2019-05-12 18:57:04 +02:00
aea79750ee
Added letterheads for 2019 ( #321 )
2019-05-12 18:37:35 +02:00
a67ccf4b81
add bank account details to contact page
2019-05-12 18:04:32 +02:00
de513e2b77
Bump commonmark from 0.8.1 to 0.9.0 in /src/requirements
...
Bumps [commonmark](https://github.com/rtfd/CommonMark-py ) from 0.8.1 to 0.9.0.
- [Release notes](https://github.com/rtfd/CommonMark-py/releases )
- [Changelog](https://github.com/rtfd/commonmark.py/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rtfd/CommonMark-py/compare/0.8.1...0.9.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-03 06:53:10 +00:00
6d32dc569c
Bump django from 2.2 to 2.2.1 in /src/requirements
...
Bumps [django](https://github.com/django/django ) from 2.2 to 2.2.1.
- [Release notes](https://github.com/django/django/releases )
- [Commits](https://github.com/django/django/compare/2.2...2.2.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-02 06:55:46 +00:00
179ac88f8d
Bump django-bleach from 0.5.2 to 0.5.3 in /src/requirements
...
Bumps [django-bleach](https://github.com/marksweb/django-bleach ) from 0.5.2 to 0.5.3.
- [Release notes](https://github.com/marksweb/django-bleach/releases )
- [Changelog](https://github.com/marksweb/django-bleach/blob/master/CHANGELOG.md )
- [Commits](https://github.com/marksweb/django-bleach/compare/0.5.2...0.5.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-19 19:53:07 +00:00
Víðir Valberg Guðmundsson
1083c2e514
Merge pull request #311 from bornhack/dependabot/pip/src/requirements/pytz-2019.1
...
Bump pytz from 2018.9 to 2019.1 in /src/requirements
2019-04-19 21:51:42 +02:00
760fa7278e
Bump defusedxml from 0.5.0 to 0.6.0 in /src/requirements
...
Bumps [defusedxml](https://github.com/tiran/defusedxml ) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/tiran/defusedxml/releases )
- [Changelog](https://github.com/tiran/defusedxml/blob/master/CHANGES.txt )
- [Commits](https://github.com/tiran/defusedxml/compare/v0.5.0...v0.6.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-18 06:47:25 +00:00
7c5040d4b6
Bump pytz from 2018.9 to 2019.1 in /src/requirements
...
Bumps [pytz](https://github.com/stub42/pytz ) from 2018.9 to 2019.1.
- [Release notes](https://github.com/stub42/pytz/releases )
- [Commits](https://github.com/stub42/pytz/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-10 06:55:10 +00:00
ba54d9f61f
Corrected logo size ( #309 )
2019-04-07 18:31:31 +02:00
5be6d74f4f
Added missing sponsor logo ( #308 )
...
lgtm
2019-04-07 18:04:35 +02:00
d65b57e651
set invoice_date and creditor for expenses for reimbursements
2019-04-07 17:28:56 +02:00
a989579f1e
add missing import
2019-04-07 16:34:41 +02:00
Víðir Valberg Guðmundsson
75c8db4577
Get rid of wrapt hack. Django 2.2 introduced setup() method on views. Yay!
2019-04-02 12:32:12 +02:00
Víðir Valberg Guðmundsson
63890131c8
Merge pull request #304 from bornhack/dependabot/pip/src/requirements/pillow-6.0.0
...
Bump pillow from 5.4.1 to 6.0.0 in /src/requirements
2019-04-02 09:19:13 +02:00
006d32b0ed
Bump django from 2.1.7 to 2.2 in /src/requirements
...
Bumps [django](https://github.com/django/django ) from 2.1.7 to 2.2.
- [Release notes](https://github.com/django/django/releases )
- [Commits](https://github.com/django/django/compare/2.1.7...2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-02 06:18:34 +00:00
57d915f321
Bump pillow from 5.4.1 to 6.0.0 in /src/requirements
...
Bumps [pillow](https://github.com/python-pillow/Pillow ) from 5.4.1 to 6.0.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases )
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst )
- [Commits](https://github.com/python-pillow/Pillow/compare/5.4.1...6.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-02 06:18:05 +00:00
Víðir Valberg Guðmundsson
1782c6c52d
Also 2017 is in the past
2019-04-01 10:39:37 +02:00
Víðir Valberg Guðmundsson
49bbf5d4b2
Change "will be" to "was" for 2019
2019-04-01 10:38:15 +02:00
Víðir Valberg Guðmundsson
af96dd7e28
Update logo for 2021.
2019-03-30 15:38:27 +01:00
77a2f43bc0
add 2021 generic logo
2019-03-30 15:24:26 +01:00
93255a4215
add 2021 template
2019-03-30 15:08:42 +01:00
0f5814b5ae
these templates are not used anymore, no need to create them in the createcamp management command
2019-03-30 15:07:40 +01:00
e6f5accaa6
add currency, show 0 DKK instead of None, enable jquery datatables for chain table in backoffice
2019-03-30 11:16:24 +01:00
30a687181e
change backoffice chain list to a table
2019-03-30 11:12:02 +01:00
78e68a2299
make the important text bold
2019-03-30 11:01:49 +01:00
a11cb38471
set creditor and debtor to null=False
2019-03-30 10:45:36 +01:00
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
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
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
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
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
c432899346
allow blank slugs
2019-03-28 07:16:02 +01:00
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
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
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
3a84dd62d2
use bleach.linkify to make links in markdown clickable automagically, fixes #64
2019-02-17 17:39:42 +01:00
8c9b2d11bf
fix expenseadmin
2019-02-10 16:33:05 +01:00
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
58d670b57f
get websocket scheme from window.location.protocol
2019-01-22 09:01:53 +01:00
d38453c745
CommonMark -> commonmark rename
2019-01-22 08:57:24 +01:00
050540c355
upgrade all pip packages to latest versions
2019-01-21 23:37:55 +01:00
3ca3631136
upgrade django, hax
2019-01-21 23:22:30 +01:00
58f3035927
switch from ws:// to wss://
2019-01-21 20:06:52 +01:00
b8fb36d346
add reimbursement_user to description of expense
2019-01-20 17:15:33 +01:00
c93b38a98b
make invoice_date a datefield not a datetimefield
2019-01-20 16:42:50 +01:00
d14708bee1
add invoice_date to django admin list display
2019-01-20 15:58:10 +01:00
51f8854a6c
show user on expense and revenue list and detail views
2019-01-20 15:50:54 +01:00
864a7e6673
add invoice_date to revenue and expense forms and templates
2019-01-20 15:39:59 +01:00
e8edb24233
add invoice_date field to Expense and Revenue models
2019-01-20 15:33:05 +01:00
29c468ab4a
show 2018 and 2019 in the camp menu dropdown
2019-01-20 09:47:47 +01:00
090a3b1e28
show both users on reimbursements
2019-01-20 09:38:18 +01:00
b4698f3fdc
fix case sensitive irc channel uniqueness check
2019-01-19 14:22:30 +01:00
1b9566ee02
make channel uniqueness check case insensitive
2019-01-19 13:49:51 +01:00
acfe658ab6
update location on frontpage
2019-01-13 17:21:57 +01:00
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
733731ecf9
take camp into account when showing economy stats
2018-11-20 18:14:16 +01:00
fd1850dd98
use psycopg2-binary and close #271
2018-11-20 17:24:19 +01:00
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
a8051783cb
upgrade requests due to vulnerability
2018-11-20 17:11:50 +01:00
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
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
95cd376f36
added danish bank transfer info ( #281 )
...
fixes issue #237
2018-11-20 00:19:32 +01:00
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
16a838a3cf
upgrade django
2018-10-03 23:41:18 +02:00
348c73323d
make sure expense attachments open in a new window
2018-09-16 11:23:32 +02:00
794e905050
show both user and reimbursement_user for reimbursements
2018-09-13 14:09:17 +02:00
ffe2fc056a
show the correct name when creating reimbursement
2018-09-13 13:53:49 +02:00
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
1cd0551d5e
the amount of an expense can NOT be negative
2018-09-01 10:25:45 +02:00
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
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
698beaaffd
refactor email functionality into seperate functions in economy.email module
2018-08-30 17:54:31 +02:00
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
435f95b70b
only use base filename, not full path lol
2018-08-30 17:31:43 +02:00
b753d05b5c
include expense uuid in subject of email to economic
2018-08-30 15:22:23 +02:00
fca7bd3721
filter on reimbursement_user not user
2018-08-30 13:24:23 +02:00
b56b9c27b4
include the actual attachment when sending to e-conomic
2018-08-30 13:17:52 +02:00
db73051a23
enable admin for Reimbursement model
2018-08-30 13:17:34 +02:00
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
93b0bff50b
permit PDF as well as images for invoice uploads for expenses
2018-08-30 12:18:56 +02:00
ed736938cc
small markup fix
2018-08-30 01:42:45 +02:00
4d6a69d50a
remove stray pk_url_kwarg
2018-08-30 01:40:39 +02:00
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
2c1e5f12fe
add textfield notes to Order for internal orga notes about the order
2018-08-27 12:44:53 +02:00
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
8b8191e16d
add custom address field to shop.models.Order and invoice template
2018-08-22 15:41:24 +02:00
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
52d3e827c8
show a message when all tokens have been found
2018-08-19 18:53:40 +02:00
387e4c1d87
filter on the correct id
2018-08-19 18:48:48 +02:00
a6e12868b3
fix order of columns
2018-08-19 18:35:40 +02:00
f408b0955a
add missing <tr> tags
2018-08-19 18:33:31 +02:00
fe4fdd06b0
show missing tokens, and show category/hint
2018-08-19 18:30:25 +02:00
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
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
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
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
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
dependabot-preview[bot]
dependabot[bot]
Thomas Flummer
Thomas Steen Rasmussen
Víðir Valberg Guðmundsson
Thomas Steen Rasmussen
Patrick Welzel
Benjamin Bach