70a7157734
Added new sponsor logos
...
- SiLabs
- Dansk Magisterforening
2019-07-16 12:07:51 +02:00
939d17c8bd
use event_type from last event from the loop, fix backtrace when updating a speakerproposal which has more than one eventproposal of the same type
2019-07-16 10:35:19 +02:00
0c53ae33c8
Bump graphene-django from 2.3.2 to 2.4.0 in /src/requirements
...
Bumps [graphene-django](https://github.com/graphql-python/graphene-django ) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/graphql-python/graphene-django/releases )
- [Commits](https://github.com/graphql-python/graphene-django/compare/v2.3.2...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 06:00:24 +00:00
5fa07f130a
add author field to rideshare, add help_text on all rideshare fields, fixup the rideshare templates a bit
2019-07-13 09:27:14 +02:00
2cad801769
make rideshare table sortable
2019-07-11 21:08:46 +02:00
9193ebcae6
pull button right
2019-07-11 20:56:09 +02:00
e4f6670c45
fixup rideshare a bit
2019-07-11 20:48:14 +02:00
881b0f4cf4
add the word Included to the VAT line on customorder invoices
2019-07-11 08:02:04 +02:00
83753cbcee
Bump django-bootstrap3 from 11.0.0 to 11.1.0 in /src/requirements
...
Bumps [django-bootstrap3](https://github.com/dyve/django-bootstrap3 ) from 11.0.0 to 11.1.0.
- [Release notes](https://github.com/dyve/django-bootstrap3/releases )
- [Changelog](https://github.com/dyve/django-bootstrap3/blob/master/HISTORY.rst )
- [Commits](https://github.com/dyve/django-bootstrap3/compare/11.0.0...11.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-10 05:39:05 +00:00
Víðir Valberg Guðmundsson
24c95a82fd
Don't empty out comment and invoice address when closing order.
2019-07-09 21:03:56 +02:00
5359ca6a35
add djangodenmark sponsor logo
2019-07-09 14:05:27 +02:00
928ab96437
also generate for instances where pdf is None (happens after instantiating a new)
2019-07-09 11:46:25 +02:00
Víðir Valberg Guðmundsson
fa855fb69e
Add cancel and proforma buttons to review and pay template.
2019-07-09 10:59:03 +02:00
Víðir Valberg Guðmundsson
3ba33649cb
Redirect to review if the order is closed but not paid. Also remove the option to remove products when the order is closed.
2019-07-09 10:46:30 +02:00
effd900b62
add proforma invoice support
2019-07-09 10:38:14 +02:00
Víðir Valberg Guðmundsson
fef09baa3d
Make review and pay button save changes made to order. Also move shop related templates back into shop app.
2019-07-09 10:07:00 +02:00
Víðir Valberg Guðmundsson
9adc2a878f
Add "review and pay" as a step in order payment. ( #356 )
2019-07-09 00:29:18 +02:00
Víðir Valberg Guðmundsson
1f2652d134
WIP Refactor of bootstrap-devsite ( #234 )
...
* Remove some repitition to make adding stuff like camps a bit better.
* added camp colours and changed to use example.com addresses
* tweaks to get factory boy to correctly save the profiles
also changed to use django specific subclass of factory boy
* Changed structure and added a few more models
Structure changed to have methods for each category, that are then called for a better overview.
Also:
- Added SponsorTiers and Sponsors
- Added Tokens and TokenFinds
- Added 2021
- Uses faker for longer descriptions
* Added blackness to new bootstrap script
2019-07-08 21:01:20 +02:00
Víðir Valberg Guðmundsson
cad6c3f0d6
Merge pull request #350 from bornhack/dependabot/pip/src/requirements/ipython-7.6.1
...
Bump ipython from 7.5.0 to 7.6.1 in /src/requirements
2019-07-08 16:03:21 +02:00
Víðir Valberg Guðmundsson
d398dc44f7
Merge pull request #352 from bornhack/dependabot/pip/src/requirements/oauthlib-3.0.2
...
Bump oauthlib from 3.0.1 to 3.0.2 in /src/requirements
2019-07-08 16:03:04 +02:00
Víðir Valberg Guðmundsson
f2961505a8
Merge pull request #349 from bornhack/dependabot/pip/src/requirements/django-2.2.3
...
Bump django from 2.2.2 to 2.2.3 in /src/requirements
2019-07-08 16:01:53 +02:00
4656d5b6a8
Smaller logo in letterhead ( #353 )
...
To prevent logo from overlapping test on eg. invoices
2019-07-08 15:21:31 +02:00
74c8ea8342
Bump oauthlib from 3.0.1 to 3.0.2 in /src/requirements
...
Bumps [oauthlib](https://github.com/oauthlib/oauthlib ) from 3.0.1 to 3.0.2.
- [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.1...v3.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-05 05:32:55 +00:00
7f433c18b7
Bump pillow from 6.0.0 to 6.1.0 in /src/requirements
...
Bumps [pillow](https://github.com/python-pillow/Pillow ) from 6.0.0 to 6.1.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/6.0.0...6.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-04 05:56:31 +00:00
7efb55b6c1
Bump ipython from 7.5.0 to 7.6.1 in /src/requirements
...
Bumps [ipython](https://github.com/ipython/ipython ) from 7.5.0 to 7.6.1.
- [Release notes](https://github.com/ipython/ipython/releases )
- [Commits](https://github.com/ipython/ipython/compare/7.5.0...7.6.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-04 05:55:39 +00:00
d8668367fe
Bump django from 2.2.2 to 2.2.3 in /src/requirements
...
Bumps [django](https://github.com/django/django ) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/django/django/releases )
- [Commits](https://github.com/django/django/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-02 05:36:07 +00:00
Víðir Valberg Guðmundsson
8ce7bce383
Redirect only if user is not superuser.
2019-06-24 15:56:09 +02:00
Víðir Valberg Guðmundsson
2172d7caf3
Woops forgot the migration.
2019-06-24 15:48:14 +02:00
Víðir Valberg Guðmundsson
6536a05e03
Woops forgot the migration.
2019-06-24 15:45:56 +02:00
Víðir Valberg Guðmundsson
3348d96d06
Add show_schedule boolean to Camp. Hide schedule link if schedule should not be shown. Close #346
2019-06-24 15:12:14 +02:00
Víðir Valberg Guðmundsson
04b8c37f76
Merge pull request #344 from bornhack/dependabot/pip/src/requirements/graphene-django-2.3.2
...
Bump graphene-django from 2.2.0 to 2.3.2 in /src/requirements
2019-06-24 15:04:23 +02:00
Víðir Valberg Guðmundsson
de2eacaccf
Merge pull request #345 from bornhack/dependabot/pip/src/requirements/django-debug-toolbar-2.0
...
Bump django-debug-toolbar from 1.11 to 2.0 in /src/requirements
2019-06-24 15:04:11 +02:00
fc96784b9b
Bump unidecode from 1.0.23 to 1.1.1 in /src/requirements
...
Bumps [unidecode](https://github.com/kmike/text-unidecode ) from 1.0.23 to 1.1.1.
- [Release notes](https://github.com/kmike/text-unidecode/releases )
- [Commits](https://github.com/kmike/text-unidecode/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-24 05:55:53 +00:00
191e390829
Bump django-debug-toolbar from 1.11 to 2.0 in /src/requirements
...
Bumps [django-debug-toolbar](https://github.com/jazzband/django-debug-toolbar ) from 1.11 to 2.0.
- [Release notes](https://github.com/jazzband/django-debug-toolbar/releases )
- [Changelog](https://github.com/jazzband/django-debug-toolbar/blob/master/docs/changes.rst )
- [Commits](https://github.com/jazzband/django-debug-toolbar/compare/1.11...2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-21 05:50:52 +00:00
2fb80fe68e
Bump graphene-django from 2.2.0 to 2.3.2 in /src/requirements
...
Bumps [graphene-django](https://github.com/graphql-python/graphene-django ) from 2.2.0 to 2.3.2.
- [Release notes](https://github.com/graphql-python/graphene-django/releases )
- [Commits](https://github.com/graphql-python/graphene-django/compare/v2.2.0...v2.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-21 05:50:23 +00:00
Víðir Valberg Guðmundsson
226fb37aa1
Fix speakerproposal form to have email as not required (set to logged in user if not filled out)
2019-06-16 15:59:12 +02:00
Víðir Valberg Guðmundsson
f1da1f3599
Merge pull request #313 from bornhack/dependabot/pip/src/requirements/channels-2.2.0
...
Bump channels from 2.1.7 to 2.2.0 in /src/requirements
2019-06-16 15:08:15 +02:00
Víðir Valberg Guðmundsson
bf2f0c7898
Blackness.
2019-06-16 14:32:24 +02:00
Víðir Valberg Guðmundsson
09c37de106
Merge pull request #329 from bornhack/dependabot/pip/src/requirements/django-cors-headers-3.0.2
...
Bump django-cors-headers from 2.5.2 to 3.0.2 in /src/requirements
2019-06-16 13:48:06 +02:00
Víðir Valberg Guðmundsson
ec3b5c0614
Merge pull request #317 from bornhack/dependabot/pip/src/requirements/ipython-7.5.0
...
Bump ipython from 7.4.0 to 7.5.0 in /src/requirements
2019-06-16 13:45:51 +02:00
1e8f1c6164
Bump channels from 2.1.7 to 2.2.0 in /src/requirements
...
Bumps [channels](https://github.com/django/channels ) from 2.1.7 to 2.2.0.
- [Release notes](https://github.com/django/channels/releases )
- [Changelog](https://github.com/django/channels/blob/master/CHANGELOG.txt )
- [Commits](https://github.com/django/channels/compare/2.1.7...2.2.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-06-16 11:45:46 +00:00
Víðir Valberg Guðmundsson
d2e2ab60b7
Merge pull request #320 from bornhack/dependabot/pip/src/requirements/commonmark-0.9.0
...
Bump commonmark from 0.8.1 to 0.9.0 in /src/requirements
2019-06-16 13:44:40 +02:00
343d82979c
Bump django-cors-headers from 2.5.2 to 3.0.2 in /src/requirements
...
Bumps [django-cors-headers](https://github.com/ottoyiu/django-cors-headers ) from 2.5.2 to 3.0.2.
- [Release notes](https://github.com/ottoyiu/django-cors-headers/releases )
- [Changelog](https://github.com/ottoyiu/django-cors-headers/blob/master/HISTORY.rst )
- [Commits](https://github.com/ottoyiu/django-cors-headers/compare/2.5.2...3.0.2 )
2019-06-16 11:42:31 +00:00
Víðir Valberg Guðmundsson
38edacac95
Merge pull request #328 from bornhack/dependabot/pip/src/requirements/django-reversion-3.0.4
...
Bump django-reversion from 3.0.3 to 3.0.4 in /src/requirements
2019-06-16 13:41:18 +02:00
e8c12a5865
Bump ipython from 7.4.0 to 7.5.0 in /src/requirements
...
Bumps [ipython](https://github.com/ipython/ipython ) from 7.4.0 to 7.5.0.
- [Release notes](https://github.com/ipython/ipython/releases )
- [Commits](https://github.com/ipython/ipython/compare/7.4.0...7.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-06-16 11:11:50 +00:00
3248568160
Bump django-reversion from 3.0.3 to 3.0.4 in /src/requirements
...
Bumps [django-reversion](https://github.com/etianen/django-reversion ) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/etianen/django-reversion/releases )
- [Changelog](https://github.com/etianen/django-reversion/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/etianen/django-reversion/compare/v3.0.3...v3.0.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-06-16 11:10:48 +00:00
Víðir Valberg Guðmundsson
b682d88645
Merge pull request #332 from bornhack/dependabot/pip/src/requirements/psycopg2-binary-2.8.3
...
Bump psycopg2-binary from 2.7.7 to 2.8.3 in /src/requirements
2019-06-16 13:10:24 +02:00
Víðir Valberg Guðmundsson
cf82a69d5e
Merge pull request #326 from bornhack/dependabot/pip/src/requirements/requests-2.22.0
...
Bump requests from 2.21.0 to 2.22.0 in /src/requirements
2019-06-16 13:09:32 +02:00
Víðir Valberg Guðmundsson
8c00cc123c
Merge pull request #323 from bornhack/dependabot/pip/src/requirements/factory-boy-2.12.0
...
Bump factory-boy from 2.11.1 to 2.12.0 in /src/requirements
2019-06-16 13:09:16 +02:00
Víðir Valberg Guðmundsson
d2b9e7508b
Merge pull request #331 from bornhack/dependabot/pip/src/requirements/django-extensions-2.1.9
...
Bump django-extensions from 2.1.6 to 2.1.9 in /src/requirements
2019-06-16 13:09:03 +02:00
b6d29a074c
Bump psycopg2-binary from 2.7.7 to 2.8.3 in /src/requirements
...
Bumps [psycopg2-binary](https://github.com/psycopg/psycopg2 ) from 2.7.7 to 2.8.3.
- [Release notes](https://github.com/psycopg/psycopg2/releases )
- [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS )
- [Commits](https://github.com/psycopg/psycopg2/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-14 08:46:40 +00:00
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
Thomas Flummer
Thomas Steen Rasmussen
dependabot-preview[bot]
Víðir Valberg Guðmundsson
Thomas Flummer
dependabot-preview[bot]
dependabot[bot]
Thomas Steen Rasmussen