reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity
1877 commits 2 branches 0 tags 164 MiB
Commit graph

1877 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Flummer ac0aff601e Added higer resolution sponsor logos 
Better for higher DPI monitors
 2019-07-28 17:21:23 +02:00
Víðir Valberg Guðmundsson 5eec38d344 It is BornHack with a capital H. 2019-07-26 14:52:06 +02:00
Víðir Valberg Guðmundsson f0bfb42ca8
Merge pull request #363 from bornhack/dependabot/pip/src/requirements/django-extensions-2.2.1 
Bump django-extensions from 2.1.9 to 2.2.1 in /src/requirements
 2019-07-23 22:34:29 +02:00
Víðir Valberg Guðmundsson 0a67177e5f
Merge pull request #351 from bornhack/dependabot/pip/src/requirements/pillow-6.1.0 
Bump pillow from 6.0.0 to 6.1.0 in /src/requirements
 2019-07-23 22:02:34 +02:00
dependabot-preview[bot] 5dc55d03a7
Bump django-extensions from 2.1.9 to 2.2.1 in /src/requirements 
Bumps [django-extensions](https://github.com/django-extensions/django-extensions) from 2.1.9 to 2.2.1.
- [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.9...2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-23 20:02:07 +00:00
Víðir Valberg Guðmundsson 8beb90a824 Only make it sticky when there is space. 2019-07-23 21:50:21 +02:00
Víðir Valberg Guðmundsson ee00ae3ee5 Make info page more "browsable". 2019-07-23 21:43:09 +02:00
Víðir Valberg Guðmundsson 2627055077 Fix tests. 2019-07-23 21:15:19 +02:00
Thomas Steen Rasmussen ca0ed4fb27 redirect back to shop after adding something to an order, and make link to shopping cart bigger 2019-07-21 16:27:25 +02:00
Thomas Steen Rasmussen 8de597d5e5 better wording on bank transfer page 2019-07-21 15:55:14 +02:00
Thomas Steen Rasmussen d276032389 better subjects for content team emails, and add quotes in body 2019-07-21 15:26:57 +02:00
Thomas Steen Rasmussen 1d24878ece add lgandersen to contributors in README.md 2019-07-21 15:06:19 +02:00
lgandersen 413f6bb276 Added new pictures for the frontpages of camp 2019, 2020 and 2021. (#362) 2019-07-21 14:56:37 +02:00
Thomas Steen Rasmussen 9fc13e43bc make some more room on the proforma invoice because multipage pdf generation is fucked right now 2019-07-18 11:09:25 +02:00
Víðir Valberg Guðmundsson ceb20bc24b Adding a button with link to shop on the 2019 frontpage. 2019-07-18 10:03:08 +02:00
Víðir Valberg Guðmundsson 0df4395787
Merge pull request #357 from bornhack/dependabot/pip/src/requirements/django-bootstrap3-11.1.0 
Bump django-bootstrap3 from 11.0.0 to 11.1.0 in /src/requirements
 2019-07-17 08:57:08 +02:00
Víðir Valberg Guðmundsson f9b388e23b
Merge pull request #358 from bornhack/dependabot/pip/src/requirements/graphene-django-2.4.0 
Bump graphene-django from 2.3.2 to 2.4.0 in /src/requirements
 2019-07-17 08:56:31 +02:00
Víðir Valberg Guðmundsson 9d9fe57266
Merge pull request #359 from bornhack/sponsors 
Added new sponsor logos
 2019-07-17 08:56:09 +02:00
Víðir Valberg Guðmundsson 8e7313e90f
Merge pull request #360 from bornhack/dependabot/pip/src/requirements/django-filter-2.2.0 
Bump django-filter from 2.1.0 to 2.2.0 in /src/requirements
 2019-07-17 08:55:47 +02:00
dependabot-preview[bot] 879a62d4fa
Bump django-filter from 2.1.0 to 2.2.0 in /src/requirements 
Bumps [django-filter](https://github.com/carltongibson/django-filter) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/carltongibson/django-filter/releases)
- [Changelog](https://github.com/carltongibson/django-filter/blob/master/CHANGES.rst)
- [Commits](https://github.com/carltongibson/django-filter/compare/2.1.0...2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-17 05:36:11 +00:00
Thomas Flummer 70a7157734 Added new sponsor logos 
- SiLabs
- Dansk Magisterforening
 2019-07-16 12:07:51 +02:00
Thomas Steen Rasmussen 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
dependabot-preview[bot] 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
Thomas Steen Rasmussen 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
Thomas Steen Rasmussen 2cad801769 make rideshare table sortable 2019-07-11 21:08:46 +02:00
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
dependabot-preview[bot] 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
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] 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
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