Commit graph

Select branches

Hide pull requests

feature/allauth-for-accounts

keycloak

main

services

stripe

vidir_refactor

#1

#11

#12

#13

#14

#15

#2

#22

#23

#24

#25

#26

#27

#29

#3

#32

#33

#35

#36

#39

#4

#40

#45

#47

#49

#5

#50

#51

#53

#55

#6

#7

#8

#9

Mono Color

• 43d5dcbd52 Set FROM field on emails (#55) main Benjamin Bach 2024-08-14 20:44:11 +0000
• cfd0d735ac
  Set FROM field on emails Benjamin Bach 2024-08-14 22:43:16 +0200
• f5feda3414 Fix invite text and add accounting context to translation messages (#53) Benjamin Bach 2024-08-14 19:52:09 +0000
• 19ae307013
  Add accounting context to translation messages Benjamin Bach 2024-08-14 21:50:30 +0200
• 3659cf40df Add more precision to the order email (#51) Benjamin Bach 2024-08-14 10:08:01 +0000
• 9c0b11b8ca
  Add more precision to the order email Benjamin Bach 2024-08-14 12:06:12 +0200
• 8f3e8f06f0 Remove unique constraint from initial field (#50) Benjamin Bach 2024-08-14 09:37:13 +0000
• fba5700838
  Remove unique constraint from initial field Benjamin Bach 2024-08-14 11:35:00 +0200
• b3795977ed Membership invitations and order emails (#47) Benjamin Bach 2024-08-14 09:17:29 +0000
• e519383741
  Use FK relation for created user, rather than boolean Benjamin Bach 2024-08-14 10:20:00 +0200
• 1c740418f4
  Clarify error messages from admin action Benjamin Bach 2024-08-14 09:55:09 +0200
• c81481747f Add a footer link to the git repo (#49) Benjamin Bach 2024-08-14 05:08:02 +0000
• dae666a12e
  Add a footer link to the git repo Benjamin Bach 2024-08-13 10:39:01 +0200
• b1ff3f985c
  Adds a README note Benjamin Bach 2024-08-13 09:50:07 +0200
• 9962f2622b
  Send order emails via admin action Benjamin Bach 2024-08-12 22:22:11 +0200
• f048e37c07
  Merge branch 'main' of git.data.coop:data.coop/membersystem into membership-invite Benjamin Bach 2024-08-12 00:12:25 +0200
• e873df8e2e
  Send invitation emails and have an invite form to create a membership Benjamin Bach 2024-08-12 00:08:26 +0200
• 52b38abf2a chore: cleanup and fix Dockerfile for development Víðir Valberg Guðmundsson 2024-08-09 08:33:14 +0200
• 1d26bbc17a
  WIP: View, form and template for invitations, add exceptions for linting rules Benjamin Bach 2024-08-08 08:37:24 +0200
• 15e422175b
  Fix error building dev project Benjamin Bach 2024-08-08 00:34:52 +0200
• 93e8028413
  WIP: Add generic email functionality, extending for sending out invite emails and order links... Benjamin Bach 2024-08-07 14:33:15 +0200
• 9e1cf5cf2a
  Add django-ratelimit as dependency Benjamin Bach 2024-08-06 23:49:21 +0200
• 00c615f318 More admin controls + Fix pay/success error 500 (#45) Benjamin Bach 2024-08-04 17:12:02 +0000
• 3af6ae0097
  Add some more admin controls Benjamin Bach 2024-08-04 12:27:02 +0200
• a93a879f50
  Don't Error 500 when using other member's Order PK etc Benjamin Bach 2024-08-04 12:06:52 +0200
• 1070e93885 Divide the amount received from Stripe by 100.0 (#40) Benjamin Bach 2024-08-04 07:34:50 +0000
• 1a4b25369b
  Divide the amount received from Stripe by 100.0 Benjamin Bach 2024-08-04 09:14:26 +0200
• ca8987ba3b Use mail_admins instead of send_mail. Víðir Valberg Guðmundsson 2024-08-03 20:53:18 +0200
• 4254baf09d Changes to payment models (#32) Benjamin Bach 2024-08-03 17:55:32 +0000
• 9326c77736
  Merge branch 'main' of git.data.coop:data.coop/membersystem into payment-updates Benjamin Bach 2024-08-03 12:56:42 +0200
• c809e5652c Update Makefile valberg 2024-08-02 22:59:51 +0000
• 59620aa309 Switch to using uv instead of pip-tools (#39) Benjamin Bach 2024-08-02 22:58:19 +0000
• 8fca53dfe9
  Switch to using uv instead of pip-tools Benjamin Bach 2024-08-02 23:52:09 +0200
• 5a8e036dd1
  Update success message Benjamin Bach 2024-08-01 17:06:04 +0200
• ba55d18e5b
  Remove duped definition of DEFAULT_FROM_EMAIL Benjamin Bach 2024-08-01 16:19:51 +0200
• 037c204411
  Re-instate updated pip-compile command, regenerate requirements*.txt Benjamin Bach 2024-08-01 13:04:31 +0200
• 37719191b7
  Clean up README Benjamin Bach 2024-08-01 12:57:28 +0200
• b9deb3f54e
  Example API key doesn't need to look like a secret Benjamin Bach 2024-08-01 12:52:14 +0200
• 0a74f62627
  Reduce amount of migrations Benjamin Bach 2024-08-01 12:51:21 +0200
• 17e5f969af
  Merge branch 'main' of git.data.coop:data.coop/membersystem into payment-updates Benjamin Bach 2024-08-01 00:59:18 +0200
• 865bc6c7bd New WaitingListEntry (#33) Benjamin Bach 2024-07-31 22:49:46 +0000
• 801f9fd209
  Merge branch 'main' of git.data.coop:data.coop/membersystem into waiting-list Benjamin Bach 2024-08-01 00:46:16 +0200
• a71c706a39
  Merge branch 'waiting-list' of git.data.coop:benjaoming/membersystem into waiting-list Benjamin Bach 2024-08-01 00:44:08 +0200
• f2fb72a2fe
  Don't import models module, use the far far far far far inferior pattern that @valberg recommends 😛 Benjamin Bach 2024-08-01 00:43:09 +0200
• 4c810efe6c
  Merge branch 'main' of git.data.coop:data.coop/membersystem into payment-updates Benjamin Bach 2024-08-01 00:34:15 +0200
• 44c0156890
  Functional webhook, clean up some model stuff, need to update migrations Benjamin Bach 2024-08-01 00:21:42 +0200
• 0cf579c5f6 Update dockerfile to using bookworm, and to avoid invalidating cache unless updating requirements. Víðir Valberg Guðmundsson 2024-07-31 23:48:39 +0200
• 7a3a629d6f Update requirements compilation to use hatch-pip-compile. Víðir Valberg Guðmundsson 2024-07-31 23:26:40 +0200
• f6d8f82065 Requirements pinning + some cleanup (#36) Benjamin Bach 2024-07-31 21:17:00 +0000
• 298a453e19
  Remove stripe session from success page (doesnt somehow work according to their docs hmm) Benjamin Bach 2024-07-31 21:35:04 +0200
• 9a61c237c7
  WIP: Handle Stripe webhook and add success/cancel pages Benjamin Bach 2024-07-31 01:02:38 +0200
• 1029162a62
  View for Stripe checkout Benjamin Bach 2024-07-30 15:21:47 +0200
• 78b3264bb6
  Add Stripe to requirements Benjamin Bach 2024-07-30 00:24:16 +0200
• e2f4a66645
  Add details to order page Benjamin Bach 2024-07-28 23:27:53 +0200
• 6bf42ecba3
  Bootstrap an Order detail page Benjamin Bach 2024-07-28 22:39:21 +0200
• 5c5153adb6
  Add signals to update Order and Membership Benjamin Bach 2024-07-28 18:55:17 +0200
• 2499c3227c
  Implements bulk-creation action for memberships and orders Benjamin Bach 2024-07-28 18:38:00 +0200
• 3193cafe4b
  Add dynamic admin actions for bulk creating memberships Benjamin Bach 2024-07-28 10:55:15 +0200
• dd33a90896 Merge branch 'main' into waiting-list benjaoming 2024-07-28 07:33:34 +0000
• 768ef5a7d2
  Add new admins, rework relation between orders and memberships, MembershipType can contain many Products, Memberships can be activated and revoked Benjamin Bach 2024-07-26 00:57:22 +0200
• 84f6ad9c4b
  Merge branch 'waiting-list' into payment-updates Benjamin Bach 2024-07-25 23:36:37 +0200
• fa6a5cdb86
  Revert healtcheck on Postgres, do it in the entrypoint Benjamin Bach 2024-07-24 22:29:07 +0200
• 24f3c30a41
  Revert "Remove health-check for Postgres (it's now in docker-compose.yml)" Benjamin Bach 2024-07-24 14:07:06 +0200
• a835db6ab9
  Loose requirements pinning in pyproject.toml and re-generate requirements Benjamin Bach 2024-07-24 11:33:43 +0200
• 0f1211fa83
  Remove health-check for Postgres (it's now in docker-compose.yml) Benjamin Bach 2024-07-24 11:33:28 +0200
• 2fd9df8cc6
  Allow pre-commit to run on my system's Python (3.10) - so I can install with pipx Benjamin Bach 2024-07-24 11:32:51 +0200
• 2c99799d4d Shorten and document Docker tweaks for Python and pip (#35) Benjamin Bach 2024-07-23 22:48:24 +0000
• e18fabbc39
  Shorten and document Docker tweaks for Python and pip Benjamin Bach 2024-07-23 13:04:03 +0200
• d9de265de9
  Fix some admin columms Benjamin Bach 2024-07-22 16:49:24 +0200
• ee2ef48b96
  Reorganize Order fields, add admin, Upgrade to Django 5.1b1 Benjamin Bach 2024-07-21 19:07:59 +0200
• e27bc7969d
  Merge branch 'waiting-list' into payment-updates Benjamin Bach 2024-07-21 16:11:53 +0200
• 5055095c6b
  Admin for Member model, not for User Benjamin Bach 2024-07-21 16:10:20 +0200
• 1f28ffc9c5
  WIP: Missing migrations Benjamin Bach 2024-07-21 13:41:50 +0200
• f30bc08451
  Merge branch 'main' of git.data.coop:data.coop/membersystem into payment-updates Benjamin Bach 2024-07-21 11:05:15 +0200
• 250f203900
  Fix some issues after merge conflixts Benjamin Bach 2024-07-20 22:45:44 +0200
• d769481848
  Add a few more README things on Docker Benjamin Bach 2024-07-20 22:33:30 +0200
• 36d71f180a
  Merge branch 'main' of git.data.coop:data.coop/membersystem into waiting-list Benjamin Bach 2024-07-20 22:24:41 +0200
• 5d516b7851 Update packages. Víðir Valberg Guðmundsson 2024-07-17 08:44:07 +0200
• ce8d4bd228 WIP. services Víðir Valberg Guðmundsson 2024-07-15 10:05:53 +0200
• 6e2ed21f67 WIP. Víðir Valberg Guðmundsson 2024-04-20 10:32:56 +0200
• 4d0062f600 WIP. Víðir Valberg Guðmundsson 2024-03-03 11:04:41 +0100
• 0508d7f2a4 WIP. Víðir Valberg Guðmundsson 2024-01-14 12:49:33 +0100
• 78fb74160b Implement django-view-decorator Víðir Valberg Guðmundsson 2024-01-14 12:27:36 +0100
• cfe44d675e Minimal CSS for tables (#26) Halfdan Mouritzen 2024-01-14 11:10:55 +0000
• dae974660d Display the services. Víðir Valberg Guðmundsson 2024-01-13 21:37:45 +0100
• 3d1b51f99b Initial stuff for services. Víðir Valberg Guðmundsson 2024-01-13 20:42:31 +0100
• f18469833a The ruffening. Víðir Valberg Guðmundsson 2024-07-15 00:19:37 +0200
• 480eecca12 Cleanup. Víðir Valberg Guðmundsson 2024-07-14 23:14:07 +0200
• b366bc2499
  WIP: cleanup setup Benjamin Bach 2024-07-14 21:19:32 +0200
• b39b114e30 pre-commit autoupdate Víðir Valberg Guðmundsson 2024-07-14 20:55:22 +0200
• 1405a95094
  Waiting list function: WaitingListEntry model for people that can be invited in the future Benjamin Bach 2024-07-14 19:18:33 +0200
• 7cc22aa0a1
  WIP: Changes to payment models Benjamin Bach 2024-07-14 18:12:14 +0200
• d31f62ebb4 Upd. Víðir Valberg Guðmundsson 2024-05-31 21:26:20 +0200
• 712c50fac7 Use hatch for installing. Víðir Valberg Guðmundsson 2024-03-03 11:05:08 +0100
• fedfca25a5 Adding flow to add new emails to an account Halfdan Mouritzen 2024-03-02 17:43:16 +0100
• 89d7c9c9d5 CSS should be merged correctly now Halfdan Mouritzen 2024-03-02 14:49:50 +0100
• f5acfbedd4 Cleaning Halfdan Mouritzen 2024-03-02 12:15:33 +0100
• cf3c84b8d9 More linting. Víðir Valberg Guðmundsson 2024-02-29 21:30:11 +0100
• 1b65558608 Lint galore. Also use python 3.12. Víðir Valberg Guðmundsson 2024-02-29 21:25:59 +0100
• 4112069cac feature/css (#29) Halfdan Mouritzen 2024-02-29 20:02:39 +0000