Commit graph

Select branches

Hide pull requests

master

shift-selling

#1

Mono Color

• 37d40469c2
  Merge pull request #371 from bornhack/add_speaker_laptop_boolean_field_to_lightning_talks Víðir Valberg Guðmundsson 2019-07-31 20:30:04 +0200
• 80793d3d1d Add "use_provided_speaker_laptop" to eventproposal_detail.html. Also correct a typo. Víðir Valberg Guðmundsson 2019-07-31 20:22:11 +0200
• 5748f9c1ee Fix tests - I think. Víðir Valberg Guðmundsson 2019-07-31 20:12:58 +0200
• 7236462023 Adding "use_provided_speaker_laptop" to EventProposal. Víðir Valberg Guðmundsson 2019-07-31 12:47:38 +0200
• f1ce253d4a Fix some stuff for new tickets. Also fix bootstrap-dev script. Víðir Valberg Guðmundsson 2019-07-30 23:38:03 +0200
• 7dc82ee4ee
  Merge pull request #370 from bornhack/ticket_type_create_single_ticket_option Víðir Valberg Guðmundsson 2019-07-30 22:58:36 +0200
• 9f251c85a6
  Merge pull request #367 from bornhack/dependabot/pip/src/requirements/ipython-7.7.0 Víðir Valberg Guðmundsson 2019-07-30 22:53:53 +0200
• ae56168ba4
  Merge pull request #368 from bornhack/dependabot/pip/src/requirements/coverage-4.5.4 Víðir Valberg Guðmundsson 2019-07-30 22:53:39 +0200
• 0373816355 Add "single_ticket_per_product" boolean to ticket types so we can control ticket creation. Víðir Valberg Guðmundsson 2019-07-30 22:51:01 +0200
• c8a4eb1f78
  Bump coverage from 4.5.3 to 4.5.4 in /src/requirements dependabot-preview[bot] 2019-07-30 05:38:22 +0000
• 024f5dd093 this was probably what it was meant to be Thomas Steen Rasmussen 2019-07-30 01:46:27 +0200
• 2c8f04a9a0
  Merge pull request #361 from bornhack/backoffice_invoice_scanning Víðir Valberg Guðmundsson 2019-07-29 22:41:37 +0200
• 55860efb8c Add create tickets action for orders. Víðir Valberg Guðmundsson 2019-07-29 22:32:49 +0200
• 7a2127d1ff Make it easier to set ticket type for products. Víðir Valberg Guðmundsson 2019-07-29 21:31:07 +0200
• 70984ab40f Remove unused template. Víðir Valberg Guðmundsson 2019-07-29 21:26:31 +0200
• c954363f3e Merge branch 'master' into backoffice_invoice_scanning Víðir Valberg Guðmundsson 2019-07-29 21:17:27 +0200
• 5d3cfe6210 Order tickets in account page. Víðir Valberg Guðmundsson 2019-07-29 21:16:48 +0200
• 444aa59159 s/name/title/g Thomas Steen Rasmussen 2019-07-29 17:00:25 +0200
• d9fa973e4b
  Bump ipython from 7.6.1 to 7.7.0 in /src/requirements dependabot-preview[bot] 2019-07-29 05:56:22 +0000
• 62db982c59 Added higer resolution sponsor logos (#366) Thomas Flummer 2019-07-28 19:51:30 +0200
• b49a2c1081 Added Siteimprove logo Thomas Flummer 2019-07-28 19:45:18 +0200
• ac0aff601e Added higer resolution sponsor logos Thomas Flummer 2019-07-28 17:21:23 +0200
• 5eec38d344 It is BornHack with a capital H. Víðir Valberg Guðmundsson 2019-07-26 14:52:06 +0200
• b7feb96c9b Adding a badge token to tickets that grant that. Víðir Valberg Guðmundsson 2019-07-24 21:08:36 +0200
• f0bfb42ca8
  Merge pull request #363 from bornhack/dependabot/pip/src/requirements/django-extensions-2.2.1 Víðir Valberg Guðmundsson 2019-07-23 22:34:29 +0200
• 0a67177e5f
  Merge pull request #351 from bornhack/dependabot/pip/src/requirements/pillow-6.1.0 Víðir Valberg Guðmundsson 2019-07-23 22:02:34 +0200
• 5dc55d03a7
  Bump django-extensions from 2.1.9 to 2.2.1 in /src/requirements dependabot-preview[bot] 2019-07-23 20:02:07 +0000
• 04d858adf3 Merge branch 'master' into backoffice_invoice_scanning Víðir Valberg Guðmundsson 2019-07-23 21:55:31 +0200
• 8beb90a824 Only make it sticky when there is space. Víðir Valberg Guðmundsson 2019-07-23 21:50:21 +0200
• ee00ae3ee5 Make info page more "browsable". Víðir Valberg Guðmundsson 2019-07-23 21:43:09 +0200
• 2627055077 Fix tests. Víðir Valberg Guðmundsson 2019-07-23 21:15:19 +0200
• ca0ed4fb27 redirect back to shop after adding something to an order, and make link to shopping cart bigger Thomas Steen Rasmussen 2019-07-21 16:27:25 +0200
• 8de597d5e5 better wording on bank transfer page Thomas Steen Rasmussen 2019-07-21 15:55:14 +0200
• d276032389 better subjects for content team emails, and add quotes in body Thomas Steen Rasmussen 2019-07-21 15:26:57 +0200
• 1d24878ece add lgandersen to contributors in README.md Thomas Steen Rasmussen 2019-07-21 15:06:19 +0200
• 413f6bb276 Added new pictures for the frontpages of camp 2019, 2020 and 2021. (#362) lgandersen 2019-07-21 14:56:37 +0200
• cad3b21fc4 handed_out -> ticket_generated Víðir Valberg Guðmundsson 2019-07-18 21:20:29 +0200
• b1b810f165 Rename handed_out field on ORP to ticket_generated. Rename checked_in on tickets to used. Add save token migration. Víðir Valberg Guðmundsson 2019-07-18 21:04:49 +0200
• 9fc13e43bc make some more room on the proforma invoice because multipage pdf generation is fucked right now Thomas Steen Rasmussen 2019-07-18 11:09:25 +0200
• ceb20bc24b Adding a button with link to shop on the 2019 frontpage. Víðir Valberg Guðmundsson 2019-07-18 10:03:08 +0200
• 5911d2042b Initial work on a more lean infodesk. Víðir Valberg Guðmundsson 2019-07-17 22:02:47 +0200
• 0df4395787
  Merge pull request #357 from bornhack/dependabot/pip/src/requirements/django-bootstrap3-11.1.0 Víðir Valberg Guðmundsson 2019-07-17 08:57:08 +0200
• f9b388e23b
  Merge pull request #358 from bornhack/dependabot/pip/src/requirements/graphene-django-2.4.0 Víðir Valberg Guðmundsson 2019-07-17 08:56:31 +0200
• 9d9fe57266
  Merge pull request #359 from bornhack/sponsors Víðir Valberg Guðmundsson 2019-07-17 08:56:09 +0200
• 8e7313e90f
  Merge pull request #360 from bornhack/dependabot/pip/src/requirements/django-filter-2.2.0 Víðir Valberg Guðmundsson 2019-07-17 08:55:47 +0200
• 879a62d4fa
  Bump django-filter from 2.1.0 to 2.2.0 in /src/requirements dependabot-preview[bot] 2019-07-17 05:36:11 +0000
• 70a7157734 Added new sponsor logos Thomas Flummer 2019-07-16 12:07:51 +0200
• 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 Thomas Steen Rasmussen 2019-07-16 10:35:19 +0200
• 0c53ae33c8
  Bump graphene-django from 2.3.2 to 2.4.0 in /src/requirements dependabot-preview[bot] 2019-07-15 06:00:24 +0000
• 5fa07f130a add author field to rideshare, add help_text on all rideshare fields, fixup the rideshare templates a bit Thomas Steen Rasmussen 2019-07-13 09:27:14 +0200
• 2cad801769 make rideshare table sortable Thomas Steen Rasmussen 2019-07-11 21:08:46 +0200
• 9193ebcae6 pull button right Thomas Steen Rasmussen 2019-07-11 20:56:09 +0200
• e4f6670c45 fixup rideshare a bit Thomas Steen Rasmussen 2019-07-11 20:48:14 +0200
• 881b0f4cf4 add the word Included to the VAT line on customorder invoices Thomas Steen Rasmussen 2019-07-11 08:02:04 +0200
• 83753cbcee
  Bump django-bootstrap3 from 11.0.0 to 11.1.0 in /src/requirements dependabot-preview[bot] 2019-07-10 05:39:05 +0000
• 24c95a82fd Don't empty out comment and invoice address when closing order. Víðir Valberg Guðmundsson 2019-07-09 21:03:51 +0200
• 5359ca6a35 add djangodenmark sponsor logo Thomas Steen Rasmussen 2019-07-09 14:05:27 +0200
• 928ab96437 also generate for instances where pdf is None (happens after instantiating a new) Thomas Steen Rasmussen 2019-07-09 11:46:25 +0200
• fa855fb69e Add cancel and proforma buttons to review and pay template. Víðir Valberg Guðmundsson 2019-07-09 10:59:03 +0200
• 3ba33649cb Redirect to review if the order is closed but not paid. Also remove the option to remove products when the order is closed. Víðir Valberg Guðmundsson 2019-07-09 10:46:30 +0200
• effd900b62 add proforma invoice support Thomas Steen Rasmussen 2019-07-09 10:38:14 +0200
• fef09baa3d Make review and pay button save changes made to order. Also move shop related templates back into shop app. Víðir Valberg Guðmundsson 2019-07-09 10:07:00 +0200
• 9adc2a878f Add "review and pay" as a step in order payment. (#356) Víðir Valberg Guðmundsson 2019-07-09 00:29:18 +0200
• 1f2652d134 WIP Refactor of bootstrap-devsite (#234) Víðir Valberg Guðmundsson 2019-07-08 21:01:20 +0200
• cad6c3f0d6
  Merge pull request #350 from bornhack/dependabot/pip/src/requirements/ipython-7.6.1 Víðir Valberg Guðmundsson 2019-07-08 16:03:21 +0200
• d398dc44f7
  Merge pull request #352 from bornhack/dependabot/pip/src/requirements/oauthlib-3.0.2 Víðir Valberg Guðmundsson 2019-07-08 16:03:04 +0200
• f2961505a8
  Merge pull request #349 from bornhack/dependabot/pip/src/requirements/django-2.2.3 Víðir Valberg Guðmundsson 2019-07-08 16:01:53 +0200
• 4656d5b6a8 Smaller logo in letterhead (#353) Thomas Flummer 2019-07-08 15:21:31 +0200
• 74c8ea8342
  Bump oauthlib from 3.0.1 to 3.0.2 in /src/requirements dependabot-preview[bot] 2019-07-05 05:32:55 +0000
• 7f433c18b7
  Bump pillow from 6.0.0 to 6.1.0 in /src/requirements dependabot-preview[bot] 2019-07-04 05:56:31 +0000
• 7efb55b6c1
  Bump ipython from 7.5.0 to 7.6.1 in /src/requirements dependabot-preview[bot] 2019-07-04 05:55:39 +0000
• d8668367fe
  Bump django from 2.2.2 to 2.2.3 in /src/requirements dependabot-preview[bot] 2019-07-02 05:36:07 +0000
• 8ce7bce383 Redirect only if user is not superuser. Víðir Valberg Guðmundsson 2019-06-24 15:56:09 +0200
• 2172d7caf3 Woops forgot the migration. Víðir Valberg Guðmundsson 2019-06-24 15:48:14 +0200
• 6536a05e03 Woops forgot the migration. Víðir Valberg Guðmundsson 2019-06-24 15:45:56 +0200
• 3348d96d06 Add show_schedule boolean to Camp. Hide schedule link if schedule should not be shown. Close #346 Víðir Valberg Guðmundsson 2019-06-24 15:11:24 +0200
• 04b8c37f76
  Merge pull request #344 from bornhack/dependabot/pip/src/requirements/graphene-django-2.3.2 Víðir Valberg Guðmundsson 2019-06-24 15:04:23 +0200
• de2eacaccf
  Merge pull request #345 from bornhack/dependabot/pip/src/requirements/django-debug-toolbar-2.0 Víðir Valberg Guðmundsson 2019-06-24 15:04:11 +0200
• 0eb454828c
  Merge pull request #347 from bornhack/dependabot/pip/src/requirements/unidecode-1.1.1 Víðir Valberg Guðmundsson 2019-06-24 15:03:43 +0200
• fc96784b9b
  Bump unidecode from 1.0.23 to 1.1.1 in /src/requirements dependabot-preview[bot] 2019-06-24 05:55:53 +0000
• 191e390829
  Bump django-debug-toolbar from 1.11 to 2.0 in /src/requirements dependabot-preview[bot] 2019-06-21 05:50:52 +0000
• 2fb80fe68e
  Bump graphene-django from 2.2.0 to 2.3.2 in /src/requirements dependabot-preview[bot] 2019-06-21 05:50:23 +0000
• 4aff8ef671 Try to force github to reindex "Jump to definition" Víðir Valberg Guðmundsson 2019-06-17 14:43:52 +0200
• 226fb37aa1 Fix speakerproposal form to have email as not required (set to logged in user if not filled out) Víðir Valberg Guðmundsson 2019-06-16 15:57:51 +0200
• f1da1f3599
  Merge pull request #313 from bornhack/dependabot/pip/src/requirements/channels-2.2.0 Víðir Valberg Guðmundsson 2019-06-16 15:08:15 +0200
• bf2f0c7898 Blackness. Víðir Valberg Guðmundsson 2019-06-16 14:32:24 +0200
• 908d753eb1 Add python 3.5 to travis. Víðir Valberg Guðmundsson 2019-06-16 14:02:00 +0200
• 09c37de106
  Merge pull request #329 from bornhack/dependabot/pip/src/requirements/django-cors-headers-3.0.2 Víðir Valberg Guðmundsson 2019-06-16 13:48:06 +0200
• ec3b5c0614
  Merge pull request #317 from bornhack/dependabot/pip/src/requirements/ipython-7.5.0 Víðir Valberg Guðmundsson 2019-06-16 13:45:51 +0200
• 1e8f1c6164
  Bump channels from 2.1.7 to 2.2.0 in /src/requirements dependabot-preview[bot] 2019-06-16 11:45:46 +0000
• d2e2ab60b7
  Merge pull request #320 from bornhack/dependabot/pip/src/requirements/commonmark-0.9.0 Víðir Valberg Guðmundsson 2019-06-16 13:44:40 +0200
• 343d82979c
  Bump django-cors-headers from 2.5.2 to 3.0.2 in /src/requirements dependabot-preview[bot] 2019-06-16 11:42:31 +0000
• 38edacac95
  Merge pull request #328 from bornhack/dependabot/pip/src/requirements/django-reversion-3.0.4 Víðir Valberg Guðmundsson 2019-06-16 13:41:18 +0200
• e8c12a5865
  Bump ipython from 7.4.0 to 7.5.0 in /src/requirements dependabot-preview[bot] 2019-06-16 11:11:50 +0000
• 3248568160
  Bump django-reversion from 3.0.3 to 3.0.4 in /src/requirements dependabot-preview[bot] 2019-06-16 11:10:48 +0000
• b682d88645
  Merge pull request #332 from bornhack/dependabot/pip/src/requirements/psycopg2-binary-2.8.3 Víðir Valberg Guðmundsson 2019-06-16 13:10:24 +0200
• cf82a69d5e
  Merge pull request #326 from bornhack/dependabot/pip/src/requirements/requests-2.22.0 Víðir Valberg Guðmundsson 2019-06-16 13:09:32 +0200
• 8c00cc123c
  Merge pull request #323 from bornhack/dependabot/pip/src/requirements/factory-boy-2.12.0 Víðir Valberg Guðmundsson 2019-06-16 13:09:16 +0200
• d2b9e7508b
  Merge pull request #331 from bornhack/dependabot/pip/src/requirements/django-extensions-2.1.9 Víðir Valberg Guðmundsson 2019-06-16 13:09:03 +0200
• fd241c4bbc
  Merge pull request #330 from bornhack/dependabot/pip/src/requirements/django-2.2.2 Víðir Valberg Guðmundsson 2019-06-16 13:04:15 +0200