reynir
/
bornhack-website
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Commit Graph

  • 005431d6f6 team shifts: implement marking shifts for sale shift-selling Reynir Björnsson 2021-08-24 18:07:58 +0200
  • b3f127f197 needs moderation Thomas Steen Rasmussen 2021-08-25 02:39:04 +0200
  • 3420394a0f needs moderation Thomas Steen Rasmussen 2021-08-25 02:36:26 +0200
  • bba67c7dbe needs moderation Thomas Steen Rasmussen 2021-08-25 02:19:28 +0200
  • 1ed70d0a07
         Merge pull request #878 from bornhack/fix_none_unpacking_when_finding_tickets master Thomas Steen Rasmussen 2021-08-19 17:50:07 +0200
  • 1d7d7a72c5 Search for both ticket token and badge token. Figure out if the token is for a badge after finding the ticket. Víðir Valberg Guðmundsson 2021-08-19 13:07:21 +0200
  • ec593751e7 Return 404 for old tokens. Now with correct import. Víðir Valberg Guðmundsson 2021-08-19 12:42:04 +0200
  • f28858e4a3 fix posdetail view when no pos json yet Thomas Steen Rasmussen 2021-08-19 10:47:33 +0200
  • df10fc89c6 Revert "Return 404 for old tokens." Víðir Valberg Guðmundsson 2021-08-19 10:33:21 +0200
  • 9e576b9f49 Return 404 for old tokens. Víðir Valberg Guðmundsson 2021-08-19 10:21:38 +0200
  • 26201be541 make mailing list email a link Thomas Steen Rasmussen 2021-08-19 08:33:47 +0200
  • aa67c49dd6 fix bug that made team mailing lists not show on the website Thomas Steen Rasmussen 2021-08-19 08:19:00 +0200
  • 95f8b2b87d team is called Sponsors Thomas Steen Rasmussen 2021-08-18 17:33:14 +0200
  • 9cac6bd8bc Try passing enable-local-file-access Víðir Valberg Guðmundsson 2021-08-18 15:15:26 +0200
  • a73035202f do not generate tickets until ticket_ready=True Thomas Steen Rasmussen 2021-08-17 21:57:36 +0200
  • f90403478b give the token system a once-over Thomas Steen Rasmussen 2021-08-17 19:11:09 +0200
  • d3cdd5a838 fix autoschedule apply success message when not doing similar schedule Thomas Steen Rasmussen 2021-08-16 00:34:56 +0200
  • 3a42b262f3 add more text to event scheduled email Thomas Steen Rasmussen 2021-08-15 22:44:33 +0200
  • 6b4d8e0790 make it optional to specify speaker_event conflicts Thomas Steen Rasmussen 2021-08-15 22:04:33 +0200
  • c8dee63751 accept all valid lengths of phonenumber in the url pattern Thomas Steen Rasmussen 2021-08-15 18:23:13 +0200
  • 816f1e5ace fix issue with editing and deleting phonebook numbers starting with one or more 0s, django would remove leading 0s because the url pattern was an int, use a regex expecting 4 digits instead Thomas Steen Rasmussen 2021-08-12 03:16:39 +0200
  • ea5fa120b1
         Merge pull request #872 from bornhack/frontpage_logo Thomas Steen Rasmussen 2021-08-11 10:14:40 +0200
  • 14d1c6f1f1
         Merge pull request #871 from bornhack/sponsor_logos Thomas Steen Rasmussen 2021-08-11 10:14:15 +0200
  • dc410f5f09
         Merge pull request #870 from bornhack/dependabot/pip/src/requirements/wheel-0.37.0 Thomas Steen Rasmussen 2021-08-11 10:13:57 +0200
  • 8b7807b88b put the latest invoice number at the top of the file Thomas Steen Rasmussen 2021-08-11 09:47:21 +0200
  • b0656ff911 add csv export of invoice list Thomas Steen Rasmussen 2021-08-11 09:36:57 +0200
  • 852c7c6a7a updated frontpage logo to be this years variant Thomas Flummer 2021-08-11 00:17:17 +0200
  • b77272419a Added aiia and Fiberby logos Thomas Flummer 2021-08-11 00:03:20 +0200
  • 8ddab4a600 fix amount and customer info Thomas Steen Rasmussen 2021-08-10 21:32:01 +0200
  • 0fe5d918ab make paid/unpaid searchable Thomas Steen Rasmussen 2021-08-10 21:22:30 +0200
  • 50bb1d4772 more work on invoice list Thomas Steen Rasmussen 2021-08-10 21:20:53 +0200
  • 288d90332b fix a few things in the invoice list Thomas Steen Rasmussen 2021-08-10 21:10:31 +0200
  • b85a1c8565 add an invoice list view in backoffice in preparation for a CSV export of the same information Thomas Steen Rasmussen 2021-08-10 21:00:44 +0200
  • 3e71a55a3a add missing endif Thomas Steen Rasmussen 2021-08-10 12:37:04 +0200
  • c76aeb3ba2
         Bump wheel from 0.36.2 to 0.37.0 in /src/requirements dependabot[bot] 2021-08-10 09:00:50 +0000
  • c3fe368ca7
         Merge pull request #863 from bornhack/dependabot/pip/src/requirements/codecov-2.1.12 Thomas Steen Rasmussen 2021-08-10 08:40:03 +0200
  • fa9e032cac
         Merge pull request #867 from bornhack/dependabot/pip/src/requirements/pre-commit-2.14.0 Thomas Steen Rasmussen 2021-08-10 08:39:45 +0200
  • a8d88b45df
         Merge pull request #868 from bornhack/dependabot/pip/src/requirements/hypothesis-6.14.6 Thomas Steen Rasmussen 2021-08-10 08:39:21 +0200
  • 2968afb1e0 show POS links in backoffice only for orga, bar and infoteam, show proxy link only to orga Thomas Steen Rasmussen 2021-08-10 08:35:59 +0200
  • de6b3cbd17
         Bump hypothesis from 6.14.3 to 6.14.6 in /src/requirements dependabot[bot] 2021-08-09 09:01:11 +0000
  • ac93cdbe30
         Bump pre-commit from 2.13.0 to 2.14.0 in /src/requirements dependabot[bot] 2021-08-09 09:01:00 +0000
  • 5162a54a2d enable email to submitter and speakers when an event is scheduled Thomas Steen Rasmussen 2021-08-07 15:31:11 +0200
  • 07197f9c53
         Bump codecov from 2.1.11 to 2.1.12 in /src/requirements dependabot[bot] 2021-08-03 09:00:47 +0000
  • d5fa4b98d5 fix ordering and epaypaymentadmin Thomas Steen Rasmussen 2021-08-03 09:03:42 +0200
  • e8d10bb7a1 make EpayPaymentAdmin more useful Thomas Steen Rasmussen 2021-08-03 08:45:41 +0200
  • fa1aac03bb allow blank values, stupid django Thomas Steen Rasmussen 2021-08-03 07:22:00 +0200
  • 48952c5463 add used_time to BaseTicket model so we know when tickets were checked in/used Thomas Steen Rasmussen 2021-08-02 20:11:36 +0200
  • a99c546e06
         Merge pull request #856 from bornhack/dependabot/pip/src/requirements/django-bleach-0.7.2 Thomas Steen Rasmussen 2021-08-02 19:48:45 +0200
  • 0b34203b0f
         Merge pull request #857 from bornhack/dependabot/pip/src/requirements/isort-5.9.3 Thomas Steen Rasmussen 2021-08-02 19:48:31 +0200
  • ab21c01cdc
         Merge pull request #860 from bornhack/dependabot/pip/src/requirements/pipdeptree-2.1.0 Thomas Steen Rasmussen 2021-08-02 19:48:19 +0200
  • 25496c5575
         Merge pull request #861 from bornhack/dependabot/pip/src/requirements/django-3.2.6 Thomas Steen Rasmussen 2021-08-02 19:48:06 +0200
  • a71443c62b
         Merge pull request #862 from bornhack/dependabot/pip/src/requirements/ipython-7.26.0 Thomas Steen Rasmussen 2021-08-02 19:47:50 +0200
  • e5df49cc94
         Bump ipython from 7.25.0 to 7.26.0 in /src/requirements dependabot[bot] 2021-08-02 09:00:54 +0000
  • 69836d9529
         Bump django from 3.2.5 to 3.2.6 in /src/requirements dependabot[bot] 2021-08-02 09:00:51 +0000
  • 0366bff6fd
         Bump pipdeptree from 2.0.0 to 2.1.0 in /src/requirements dependabot[bot] 2021-08-02 09:00:48 +0000
  • 7d4ad533f7 remove oooold typo Thomas Steen Rasmussen 2021-08-01 18:12:58 +0200
  • 792fc2bfc0 unbreak refund order function, while here show on order list and detail pages if an order is refunded, also fix tickettype detail stats so they dont include refunded orders Thomas Steen Rasmussen 2021-08-01 17:45:37 +0200
  • 929cde010e do not crap out when no tickets exist Thomas Steen Rasmussen 2021-08-01 17:43:53 +0200
  • b5dd97e935 Initial docker-compose setup Víðir Valberg Guðmundsson 2021-07-29 11:31:45 +0200
  • db7d4909c7
         Merge pull request #859 from bornhack/add_ticket_stats_on_overview_take_two Thomas Steen Rasmussen 2021-07-30 07:28:33 +0200
  • 1889d3bf15 income not cost. Víðir Valberg Guðmundsson 2021-07-29 20:35:14 +0200
  • 34dcacea0c DRYing the method up a bit. Víðir Valberg Guðmundsson 2021-07-29 20:33:43 +0200
  • 4ed6392554 Avoid rounding down. Víðir Valberg Guðmundsson 2021-07-29 17:13:58 +0200
  • 198f6d26c7 Added avg. price per ticket per ticket type. Víðir Valberg Guðmundsson 2021-07-29 17:08:43 +0200
  • 4ed1b51ba2 This time the numbers add up. Víðir Valberg Guðmundsson 2021-07-29 16:47:42 +0200
  • 67ac9ee820 It was being used. Víðir Valberg Guðmundsson 2021-07-29 15:13:23 +0200
  • e96b8a9e44
         Merge pull request #858 from bornhack/add_ticket_stats_on_overview Thomas Steen Rasmussen 2021-07-29 15:16:52 +0200
  • 1006b926c5 Add annotations that provide a per ticket type sales information. Víðir Valberg Guðmundsson 2021-07-29 15:08:20 +0200
  • 2ca5fb5314 fix ticket view after order<>opr change Thomas Steen Rasmussen 2021-07-29 12:30:35 +0200
  • 846564959a
         Bump isort from 5.9.2 to 5.9.3 in /src/requirements dependabot[bot] 2021-07-29 09:00:43 +0000
  • 02424115f2 enable save as new for Facility, FacilityType, facilityOpeningHours admin Thomas Steen Rasmussen 2021-07-29 09:32:07 +0200
  • 517f29940a remove FK from ShopTicket to Order and replace with an FK to OrderProductRelation Thomas Steen Rasmussen 2021-07-29 09:03:52 +0200
  • 37ab7e3633
         Bump django-bleach from 0.7.0 to 0.7.2 in /src/requirements dependabot[bot] 2021-07-28 09:00:54 +0000
  • 4c6eca2a6d backoffice: add average price across all tickets of the given type to the tickettype stats detail view Thomas Steen Rasmussen 2021-07-26 18:47:34 +0200
  • a494bdfd4b backoffice: add totals to the bottom of ticket type details table Thomas Steen Rasmussen 2021-07-26 18:09:11 +0200
  • 02b796e90b rename to paid_order_count Thomas Steen Rasmussen 2021-07-22 08:06:43 +0200
  • f61d0b85e8 use Count() to get the number of paid orders for the product Thomas Steen Rasmussen 2021-07-22 08:02:28 +0200
  • b76cc2ed64 remove wrong info for now Thomas Steen Rasmussen 2021-07-22 07:55:58 +0200
  • 21b479e253 only count paid orders Thomas Steen Rasmussen 2021-07-22 07:12:13 +0200
  • 41467447a8 always mark OPR as ticket_generated=True Thomas Steen Rasmussen 2021-07-22 00:35:07 +0200
  • 0e0374b577 calculate profit in the database, skip the margin calculation for now Thomas Steen Rasmussen 2021-07-22 00:07:30 +0200
  • ec816a5c11 realise there can be more than one thing on each ticket, fix Thomas Steen Rasmussen 2021-07-21 23:14:48 +0200
  • 0973709ef0 fix profit margin calculation Thomas Steen Rasmussen 2021-07-21 21:36:50 +0200
  • 21111e0c2c typo Thomas Steen Rasmussen 2021-07-21 21:32:46 +0200
  • 5c410939ed add detailed ticket stats view Thomas Steen Rasmussen 2021-07-21 21:29:55 +0200
  • a8c4894b8f brush the dust off of the event system, add a new eventtype ticket_stats, add a management command to post ticket stats to irc, add a backoffice view showing ticket stats Thomas Steen Rasmussen 2021-07-21 18:53:53 +0200
  • 4d06e647a2 ircbot: detect when the bot gets +o in a channel, and register it if needed Thomas Steen Rasmussen 2021-07-20 11:09:53 +0200
  • efdc519c0b add skeleton on_mode() handler to ircbot Thomas Steen Rasmussen 2021-07-20 08:16:32 +0200
  • 8661c423fe copy paste error Thomas Steen Rasmussen 2021-07-20 07:22:01 +0200
  • 786e9d10bd add IrcOverView Thomas Steen Rasmussen 2021-07-19 22:02:35 +0200
  • 949cb05ae1 remove all attempts to this the right way and do it the wrong way instead. This is fine. Thomas Steen Rasmussen 2021-07-19 21:10:40 +0200
  • 4d1b96a5b8 use --ignore-init-module-imports Thomas Steen Rasmussen 2021-07-19 17:09:56 +0200
  • 01687ea11a run pre-commit --all-files, it's been a while since last time Thomas Steen Rasmussen 2021-07-19 15:06:10 +0200
  • a21bc1097c split backoffice views.py into multiple files, add autoflake to pre-commit Thomas Steen Rasmussen 2021-07-19 15:00:59 +0200
  • f0f5a609b6
         Merge pull request #852 from bornhack/dependabot/pip/src/requirements/hypothesis-6.14.3 Thomas Steen Rasmussen 2021-07-19 13:40:57 +0200
  • ef929b4cd4
         Bump hypothesis from 6.14.2 to 6.14.3 in /src/requirements dependabot[bot] 2021-07-19 11:26:22 +0000
  • cdd41c28f6
         Merge pull request #851 from bornhack/dependabot/pip/src/requirements/black-21.7b0 Thomas Steen Rasmussen 2021-07-19 13:25:39 +0200
  • e62caaa549
         Bump black from 21.6b0 to 21.7b0 in /src/requirements dependabot[bot] 2021-07-19 09:00:43 +0000
  • d74c8c2b73
         Merge pull request #847 from bornhack/dependabot/pip/src/requirements/channels-3.0.4 Thomas Steen Rasmussen 2021-07-12 22:24:38 +0200
  • b5147cd875
         Merge pull request #848 from bornhack/dependabot/pip/src/requirements/hypothesis-6.14.2 Thomas Steen Rasmussen 2021-07-12 22:24:22 +0200