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

2437 commits

This branch
This branch
All branches
Author SHA1 Message Date
Víðir Valberg Guðmundsson 4ed1b51ba2 This time the numbers add up. 2021-07-29 16:47:42 +02:00
Víðir Valberg Guðmundsson 67ac9ee820 It was being used. 2021-07-29 15:23:18 +02:00
Thomas Steen Rasmussen e96b8a9e44
Merge pull request #858 from bornhack/add_ticket_stats_on_overview 
Add annotations that provide a per ticket type sales information.
 2021-07-29 15:16:52 +02:00
Víðir Valberg Guðmundsson 1006b926c5 Add annotations that provide a per ticket type sales information. 2021-07-29 15:08:20 +02:00
Thomas Steen Rasmussen 2ca5fb5314 fix ticket view after order<>opr change 2021-07-29 12:30:35 +02:00
Thomas Steen Rasmussen 02424115f2 enable save as new for Facility, FacilityType, facilityOpeningHours admin 2021-07-29 09:32:07 +02:00
Thomas Steen Rasmussen 517f29940a remove FK from ShopTicket to Order and replace with an FK to OrderProductRelation 2021-07-29 09:03:52 +02:00
Thomas Steen Rasmussen 4c6eca2a6d backoffice: add average price across all tickets of the given type to the tickettype stats detail view 2021-07-26 18:47:34 +02:00
Thomas Steen Rasmussen a494bdfd4b backoffice: add totals to the bottom of ticket type details table 2021-07-26 18:09:11 +02:00
Thomas Steen Rasmussen 02b796e90b rename to paid_order_count 2021-07-22 08:06:43 +02:00
Thomas Steen Rasmussen f61d0b85e8 use Count() to get the number of paid orders for the product 2021-07-22 08:02:28 +02:00
Thomas Steen Rasmussen b76cc2ed64 remove wrong info for now 2021-07-22 07:55:58 +02:00
Thomas Steen Rasmussen 21b479e253 only count paid orders 2021-07-22 07:12:13 +02:00
Thomas Steen Rasmussen 41467447a8 always mark OPR as ticket_generated=True 2021-07-22 00:35:07 +02:00
Thomas Steen Rasmussen 0e0374b577 calculate profit in the database, skip the margin calculation for now 2021-07-22 00:07:30 +02:00
Thomas Steen Rasmussen ec816a5c11 realise there can be more than one thing on each ticket, fix 2021-07-21 23:14:48 +02:00
Thomas Steen Rasmussen 0973709ef0 fix profit margin calculation 2021-07-21 21:36:50 +02:00
Thomas Steen Rasmussen 21111e0c2c typo 2021-07-21 21:32:46 +02:00
Thomas Steen Rasmussen 5c410939ed add detailed ticket stats view 2021-07-21 21:29:55 +02:00
Thomas Steen Rasmussen 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 2021-07-21 18:53:53 +02:00
Thomas Steen Rasmussen 4d06e647a2 ircbot: detect when the bot gets +o in a channel, and register it if needed 2021-07-20 11:09:53 +02:00
Thomas Steen Rasmussen efdc519c0b add skeleton on_mode() handler to ircbot 2021-07-20 08:16:32 +02:00
Thomas Steen Rasmussen 8661c423fe copy paste error 2021-07-20 07:22:01 +02:00
Thomas Steen Rasmussen 786e9d10bd add IrcOverView 2021-07-19 22:02:35 +02:00
Thomas Steen Rasmussen 949cb05ae1 remove all attempts to this the right way and do it the wrong way instead. This is fine. 2021-07-19 21:10:40 +02:00
Thomas Steen Rasmussen 4d1b96a5b8 use --ignore-init-module-imports 2021-07-19 17:09:56 +02:00
Thomas Steen Rasmussen 01687ea11a run pre-commit --all-files, it's been a while since last time 2021-07-19 15:06:10 +02:00
Thomas Steen Rasmussen a21bc1097c split backoffice views.py into multiple files, add autoflake to pre-commit 2021-07-19 15:00:59 +02:00
Thomas Steen Rasmussen f0f5a609b6
Merge pull request #852 from bornhack/dependabot/pip/src/requirements/hypothesis-6.14.3 
Bump hypothesis from 6.14.2 to 6.14.3 in /src/requirements
 2021-07-19 13:40:57 +02:00
dependabot[bot] ef929b4cd4
Bump hypothesis from 6.14.2 to 6.14.3 in /src/requirements 
Bumps [hypothesis](https://github.com/HypothesisWorks/hypothesis) from 6.14.2 to 6.14.3.
- [Release notes](https://github.com/HypothesisWorks/hypothesis/releases)
- [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.14.2...hypothesis-python-6.14.3)

---
updated-dependencies:
- dependency-name: hypothesis
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-19 11:26:22 +00:00
Thomas Steen Rasmussen cdd41c28f6
Merge pull request #851 from bornhack/dependabot/pip/src/requirements/black-21.7b0 
Bump black from 21.6b0 to 21.7b0 in /src/requirements
 2021-07-19 13:25:39 +02:00
dependabot[bot] e62caaa549
Bump black from 21.6b0 to 21.7b0 in /src/requirements 
Bumps [black](https://github.com/psf/black) from 21.6b0 to 21.7b0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-19 09:00:43 +00:00
Thomas Steen Rasmussen d74c8c2b73
Merge pull request #847 from bornhack/dependabot/pip/src/requirements/channels-3.0.4 
Bump channels from 3.0.3 to 3.0.4 in /src/requirements
 2021-07-12 22:24:38 +02:00
Thomas Steen Rasmussen b5147cd875
Merge pull request #848 from bornhack/dependabot/pip/src/requirements/hypothesis-6.14.2 
Bump hypothesis from 6.13.1 to 6.14.2 in /src/requirements
 2021-07-12 22:24:22 +02:00
Thomas Steen Rasmussen 5b73d43504
Merge pull request #849 from bornhack/dependabot/pip/src/requirements/django-reversion-4.0.0 
Bump django-reversion from 3.0.9 to 4.0.0 in /src/requirements
 2021-07-12 22:24:07 +02:00
Thomas Steen Rasmussen 5e19303250
Merge pull request #850 from bornhack/dependabot/pip/src/requirements/django-allauth-0.45.0 
Bump django-allauth from 0.44.0 to 0.45.0 in /src/requirements
 2021-07-12 22:23:49 +02:00
dependabot[bot] 88385423d0
Bump django-allauth from 0.44.0 to 0.45.0 in /src/requirements 
Bumps [django-allauth](https://github.com/pennersr/django-allauth) from 0.44.0 to 0.45.0.
- [Release notes](https://github.com/pennersr/django-allauth/releases)
- [Changelog](https://github.com/pennersr/django-allauth/blob/master/ChangeLog.rst)
- [Commits](https://github.com/pennersr/django-allauth/compare/0.44.0...0.45.0)

---
updated-dependencies:
- dependency-name: django-allauth
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-12 09:00:59 +00:00
dependabot[bot] c63b48923a
Bump django-reversion from 3.0.9 to 4.0.0 in /src/requirements 
Bumps [django-reversion](https://github.com/etianen/django-reversion) from 3.0.9 to 4.0.0.
- [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.9...v4.0.0)

---
updated-dependencies:
- dependency-name: django-reversion
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-12 09:00:55 +00:00
dependabot[bot] c838411841
Bump hypothesis from 6.13.1 to 6.14.2 in /src/requirements 
Bumps [hypothesis](https://github.com/HypothesisWorks/hypothesis) from 6.13.1 to 6.14.2.
- [Release notes](https://github.com/HypothesisWorks/hypothesis/releases)
- [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.13.1...hypothesis-python-6.14.2)

---
updated-dependencies:
- dependency-name: hypothesis
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-12 09:00:52 +00:00
dependabot[bot] f1cc46063f
Bump channels from 3.0.3 to 3.0.4 in /src/requirements 
Bumps [channels](https://github.com/django/channels) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/django/channels/releases)
- [Changelog](https://github.com/django/channels/blob/main/CHANGELOG.txt)
- [Commits](https://github.com/django/channels/compare/3.0.3...3.0.4)

---
updated-dependencies:
- dependency-name: channels
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-12 09:00:42 +00:00
Thomas Steen Rasmussen b2fc598c27 elaborate captcha helptext with a hint due to popular demand 2021-07-11 02:28:44 +02:00
Thomas Steen Rasmussen 4b5ff018b0
Merge pull request #837 from bornhack/dependabot/pip/src/requirements/ipython-7.25.0 
Bump ipython from 7.24.1 to 7.25.0 in /src/requirements
 2021-07-11 02:24:35 +02:00
Thomas Steen Rasmussen f8d13816e5
Merge pull request #839 from bornhack/dependabot/pip/src/requirements/django-3.2.5 
Bump django from 3.2.4 to 3.2.5 in /src/requirements
 2021-07-11 02:24:26 +02:00
Thomas Steen Rasmussen 86a25070b0
Merge pull request #841 from bornhack/dependabot/pip/src/requirements/channels-redis-3.3.0 
Bump channels-redis from 3.2.0 to 3.3.0 in /src/requirements
 2021-07-11 02:24:15 +02:00
Thomas Steen Rasmussen 4bb5a72904
Merge pull request #843 from bornhack/dependabot/pip/src/requirements/django-taggit-1.5.1 
Bump django-taggit from 1.4.0 to 1.5.1 in /src/requirements
 2021-07-11 02:23:59 +02:00
Thomas Steen Rasmussen 39188f5e3a
Merge pull request #844 from bornhack/dependabot/pip/src/requirements/pillow-8.3.1 
Bump pillow from 8.2.0 to 8.3.1 in /src/requirements
 2021-07-11 02:23:51 +02:00
Thomas Steen Rasmussen 97e5e9e622
Merge pull request #845 from bornhack/dependabot/pip/src/requirements/isort-5.9.2 
Bump isort from 5.9.1 to 5.9.2 in /src/requirements
 2021-07-11 02:23:40 +02:00
Thomas Steen Rasmussen 57c8952d19
Merge pull request #846 from bornhack/dependabot/pip/src/requirements/django-bleach-0.7.0 
Bump django-bleach from 0.6.1 to 0.7.0 in /src/requirements
 2021-07-11 02:23:29 +02:00
dependabot[bot] a46347e1c8
Bump django-bleach from 0.6.1 to 0.7.0 in /src/requirements 
Bumps [django-bleach](https://github.com/marksweb/django-bleach) from 0.6.1 to 0.7.0.
- [Release notes](https://github.com/marksweb/django-bleach/releases)
- [Changelog](https://github.com/marksweb/django-bleach/blob/master/CHANGELOG.md)
- [Commits](https://github.com/marksweb/django-bleach/compare/0.6.1...0.7.0)

---
updated-dependencies:
- dependency-name: django-bleach
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-09 09:00:44 +00:00
Thomas Steen Rasmussen 128504d23f
Fix some wording in T&C referring to 2016 2021-07-08 11:45:50 +02:00