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

2221 commits

This branch
This branch
All branches
Author SHA1 Message Date
Víðir Valberg Guðmundsson 2751b92cb8 Find the right sponsors. 2019-08-08 10:03:27 +02:00
Víðir Valberg Guðmundsson 74a9e9df71 Check if tickets are generated. Also show if tickets are generated in the admin. 2019-08-08 09:55:06 +02:00
Thomas Steen Rasmussen ac19a6db4b add management command to email sponsor tickets 2019-08-08 09:44:47 +02:00
Víðir Valberg Guðmundsson 99977759ee
Merge pull request #375 from bornhack/more_attachments 
More attachments
 2019-08-07 23:38:28 +02:00
Víðir Valberg Guðmundsson 3600ed6190 Third times the charm? 2019-08-07 23:33:56 +02:00
Víðir Valberg Guðmundsson c088594e74 Actually add more attachments 2019-08-07 23:29:13 +02:00
Víðir Valberg Guðmundsson ba23234a15 Multiple attachments on mails 2019-08-07 23:25:52 +02:00
dependabot-preview[bot] ec2247a9eb
Bump oauthlib from 3.0.2 to 3.1.0 in /src/requirements 
Bumps [oauthlib](https://github.com/oauthlib/oauthlib) from 3.0.2 to 3.1.0.
- [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.2...v3.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-07 05:45:00 +00:00
Víðir Valberg Guðmundsson 943dcf8abd Add Mikjaer Studios logo. 2019-08-06 12:07:41 +02:00
Víðir Valberg Guðmundsson a1dc9f0413
Merge pull request #373 from bornhack/sponsors 
More Sponsors
 2019-08-06 12:00:03 +02:00
Thomas Flummer 540bfdcbac Added more sponsor logos 
Added Umbraco, Dansk Magisterforening and zibra group
 2019-08-06 11:51:12 +02:00
Thomas Flummer ecb188c55a Merge branch 'master' into sponsors 2019-08-06 11:49:06 +02:00
Víðir Valberg Guðmundsson 94a142f6b9 Polishing finding tickets by scanning and marking stuff as handed out/checked in. 2019-08-04 00:18:52 +02:00
Víðir Valberg Guðmundsson 7be4aa6545 Ticket tokens and badge tokens can be blank since we generate them on save. Also use the correct method for generating badge tokens, and do a small regression test for that. 2019-08-03 22:53:01 +02:00
Víðir Valberg Guðmundsson b842bb99e7 Upgrade django to 2.2.4 2019-08-01 20:26:48 +02:00
Víðir Valberg Guðmundsson 08d0dd7161 Make provided laptop default=True. 2019-08-01 09:34:00 +02:00
dependabot-preview[bot] dbd7a30e20
Bump pytz from 2019.1 to 2019.2 in /src/requirements 
Bumps [pytz](https://github.com/stub42/pytz) from 2019.1 to 2019.2.
- [Release notes](https://github.com/stub42/pytz/releases)
- [Commits](https://github.com/stub42/pytz/compare/release_2019.1...release_2019.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-01 05:38:56 +00:00
Víðir Valberg Guðmundsson b89f09105c Make team guide only visible for approved members. Fix #369. 2019-07-31 21:14:17 +02:00
Víðir Valberg Guðmundsson 37d40469c2
Merge pull request #371 from bornhack/add_speaker_laptop_boolean_field_to_lightning_talks 
Adding "use_provided_speaker_laptop" to EventProposal.
 2019-07-31 20:30:04 +02:00
Víðir Valberg Guðmundsson 80793d3d1d Add "use_provided_speaker_laptop" to eventproposal_detail.html. Also correct a typo. 2019-07-31 20:22:11 +02:00
Víðir Valberg Guðmundsson 5748f9c1ee Fix tests - I think. 2019-07-31 20:12:58 +02:00
Víðir Valberg Guðmundsson 7236462023 Adding "use_provided_speaker_laptop" to EventProposal. 2019-07-31 12:47:38 +02:00
Víðir Valberg Guðmundsson f1ce253d4a Fix some stuff for new tickets. Also fix bootstrap-dev script. 2019-07-30 23:38:03 +02:00
Víðir Valberg Guðmundsson 7dc82ee4ee
Merge pull request #370 from bornhack/ticket_type_create_single_ticket_option 
Add "single_ticket_per_product" boolean to ticket types
 2019-07-30 22:58:36 +02:00
Víðir Valberg Guðmundsson 9f251c85a6
Merge pull request #367 from bornhack/dependabot/pip/src/requirements/ipython-7.7.0 
Bump ipython from 7.6.1 to 7.7.0 in /src/requirements
 2019-07-30 22:53:53 +02:00
Víðir Valberg Guðmundsson ae56168ba4
Merge pull request #368 from bornhack/dependabot/pip/src/requirements/coverage-4.5.4 
Bump coverage from 4.5.3 to 4.5.4 in /src/requirements
 2019-07-30 22:53:39 +02:00
Víðir Valberg Guðmundsson 0373816355 Add "single_ticket_per_product" boolean to ticket types so we can control ticket creation. 2019-07-30 22:51:01 +02:00
dependabot-preview[bot] c8a4eb1f78
Bump coverage from 4.5.3 to 4.5.4 in /src/requirements 
Bumps [coverage](https://github.com/nedbat/coveragepy) from 4.5.3 to 4.5.4.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](https://github.com/nedbat/coveragepy/compare/coverage-4.5.3...coverage-4.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-30 05:38:22 +00:00
Thomas Steen Rasmussen 024f5dd093 this was probably what it was meant to be 2019-07-30 01:46:27 +02:00
Víðir Valberg Guðmundsson 2c8f04a9a0
Merge pull request #361 from bornhack/backoffice_invoice_scanning 
Save ticket tokens to db. Rename some fields to make using tickets more sane. Initial scanning of tickets.
 2019-07-29 22:41:37 +02:00
Víðir Valberg Guðmundsson 55860efb8c Add create tickets action for orders. 2019-07-29 22:32:49 +02:00
Víðir Valberg Guðmundsson 7a2127d1ff Make it easier to set ticket type for products. 2019-07-29 21:31:07 +02:00
Víðir Valberg Guðmundsson 70984ab40f Remove unused template. 2019-07-29 21:26:31 +02:00
Víðir Valberg Guðmundsson c954363f3e Merge branch 'master' into backoffice_invoice_scanning 2019-07-29 21:17:27 +02:00
Víðir Valberg Guðmundsson 5d3cfe6210 Order tickets in account page. 2019-07-29 21:16:48 +02:00
Thomas Steen Rasmussen 444aa59159 s/name/title/g 2019-07-29 17:00:25 +02:00
dependabot-preview[bot] d9fa973e4b
Bump ipython from 7.6.1 to 7.7.0 in /src/requirements 
Bumps [ipython](https://github.com/ipython/ipython) from 7.6.1 to 7.7.0.
- [Release notes](https://github.com/ipython/ipython/releases)
- [Commits](https://github.com/ipython/ipython/compare/7.6.1...7.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 05:56:22 +00:00
Thomas Flummer 62db982c59 Added higer resolution sponsor logos (#366) 
* Added higer resolution sponsor logos

Better for higher DPI monitors

* Added Siteimprove logo
 2019-07-28 19:51:30 +02:00
Thomas Flummer b49a2c1081 Added Siteimprove logo 2019-07-28 19:45:18 +02:00
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 b7feb96c9b Adding a badge token to tickets that grant that. 2019-07-24 21:08:36 +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 04d858adf3 Merge branch 'master' into backoffice_invoice_scanning 2019-07-23 21:55:31 +02: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