Thomas Steen Rasmussen
9193ebcae6
pull button right
2019-07-11 20:56:09 +02:00
Thomas Steen Rasmussen
e4f6670c45
fixup rideshare a bit
2019-07-11 20:48:14 +02:00
Thomas Steen Rasmussen
881b0f4cf4
add the word Included to the VAT line on customorder invoices
2019-07-11 08:02:04 +02: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
Thomas Steen Rasmussen
5359ca6a35
add djangodenmark sponsor logo
2019-07-09 14:05:27 +02:00
Thomas Steen Rasmussen
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
Thomas Steen Rasmussen
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
Thomas Flummer
4656d5b6a8
Smaller logo in letterhead ( #353 )
...
To prevent logo from overlapping test on eg. invoices
2019-07-08 15:21:31 +02:00
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot-preview[bot]
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
dependabot[bot]
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
dependabot[bot]
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
Thomas Flummer
7ed9bec954
New logo on 2019 frontpage ( #322 )
2019-05-12 18:57:04 +02:00
Thomas Flummer
aea79750ee
Added letterheads for 2019 ( #321 )
2019-05-12 18:37:35 +02:00