Commit graph

Select branches

Hide pull requests

feature-126

feature/invitelink-token

feature/microsoft-auth

feature/slugs

hlds-verify-choice-option-count

master

order-no-auth

show-logo-at-home

slug

#77

#78

#79

#80

Mono Color

• 3cde7764c4
  
  Update syntax for lifted double space requirement master Midgard 2024-06-29 11:56:12 +0200
• 73671bd8f1
  Merge pull request #213 from ZeusWPI/feat/docker redfast00 2023-06-28 22:09:06 +0200
• 45b4913657
  Add menus provided by Zeus WPI by default Maxim De Clercq 2023-04-20 20:12:21 +0200
• 7b78e7d8ff
  Add .dockerignore Maxim De Clercq 2023-04-20 19:50:23 +0200
• a29d3a33be
  Use correct app when running with waitress Maxim De Clercq 2023-04-20 02:33:36 +0200
• 7fad75fc08
  Dockerize the application Maxim De Clercq 2023-04-19 23:48:59 +0200
• 5a82354b78
  Merge pull request #214 from ZeusWPI/microsoft-auth-wip redfast00 2023-06-25 16:49:13 +0200
• fbb69c843a
  Merge branch 'master' into microsoft-auth-wip Maxim De Clercq 2023-06-25 16:18:32 +0200
• 30626e457a
  Merge pull request #217 from ZeusWPI/no-double-space redfast00 2023-06-13 23:31:56 +0200
• 0aea3f6d34
  Remove double space requirement redfast00 2023-06-13 21:39:19 +0200
• cdca5646ef
  Merge pull request #204 from Happilands/patch-1 redfast00 2023-04-22 17:52:17 +0200
• 8b1b3f482a
  Add migration for Microsoft Auth Maxim De Clercq 2023-04-20 02:07:43 +0200
• 2d6aea10fb
  Change Microsoft account type to ugentbe.onmicrosoft.com Maxim De Clercq 2023-04-19 23:17:51 +0200
• 6e79fc50ed
  Merge pull request #186 from ZeusWPI/feature/microsoft-auth Maxim De Clercq 2023-04-19 22:55:32 +0200
• ba29ecbc73
  Check for user with matching Microsoft UUID first Maxim De Clercq 2023-04-19 22:38:30 +0200
• 1ffcdc3ec1
  Do not store UGent username since it is not exposed through Graph API Maxim De Clercq 2023-04-19 22:03:40 +0200
• 6bb11e49a3
  Add support for when cwd is outside the project Maxim De Clercq 2023-04-19 21:18:44 +0200
• aab522eef9
  Merge branch 'master' into feature/microsoft-auth Maxim De Clercq 2023-04-19 20:55:35 +0200
• e86fce0a7e
  Merge branch 'master' into patch-1 Tibo 2023-04-19 19:14:54 +0200
• 02afba70a9
  Merge pull request #212 from ZeusWPI/fix/admin-order-current-top Charlotte Van Petegem 2023-01-24 19:11:21 +0100
• 1bc6a5931e
  Order current user to the top for admins Charlotte Van Petegem 2023-01-24 19:06:10 +0100
• c991cd7882
  Merge pull request #207 from JasperJanin/master Jasper 2022-10-27 22:15:37 +0200
• a29ade4773 Remove redundant class attributes Jasper Janin 2022-10-27 22:12:03 +0200
• 6f7aff15cc
  Merge branch 'ZeusWPI:master' into master Jasper 2022-10-27 21:35:28 +0200
• 7b12c266b3 Add user group reference to orders Jasper Janin 2022-10-27 21:32:22 +0200
• 7d122cf6e9
  Merge pull request #203 from ZeusWPI/addToolversions Tibo 2022-10-27 21:32:06 +0200
• 202d5d3e7a
  Revert "Merge branch 'master' of github.com:ZeusWPI/Haldis" Charlotte Van Petegem 2022-10-27 21:23:13 +0200
• 28fa1b7592 Merge branch 'master' of github.com:ZeusWPI/Haldis Jasper Janin 2022-10-27 20:28:11 +0200
• bf8eb94117 Add user group reference to orders Jasper Janin 2022-10-27 20:24:35 +0200
• b14671413c
  Merge pull request #206 from ZeusWPI/sentry-local-dev Maxime 2022-10-27 19:49:57 +0200
• 29afc8db7a
  Make sure local dev still works with sentry Charlotte Van Petegem 2022-10-27 19:47:12 +0200
• 1dcd723bd4
  Merge pull request #205 from ZeusWPI/add-sentry Charlotte Van Petegem 2022-10-27 19:41:26 +0200
• c0f44ab037
  Add glitchtip Charlotte Van Petegem 2022-10-27 19:38:46 +0200
• 4e8799eca5
  Add robots.txt file Happilands 2022-10-27 19:29:50 +0200
• e302da0335 .tool-versions toegevoegd AlexVDP8 2022-10-27 19:15:29 +0200
• c839fce270
  Merge pull request #199 from ZeusWPI/fix/delete-bottom-list redfast00 2022-06-10 18:41:14 +0200
• 687d389fa2
  Fix not being able to delete an item from the list at the bottom of an order Charlotte Van Petegem 2022-06-10 18:28:31 +0200
• 9c4361ab1b
  Merge pull request #197 from ZeusWPI/remove-dot-title-from-username redfast00 2022-06-03 19:36:54 +0200
• 754eae4a50
  Don't title username redfast00 2022-06-03 19:27:11 +0200
• f3911b377d
  Merge pull request #196 from ZeusWPI/eight-character-slug Charlotte Van Petegem 2022-06-03 19:16:11 +0200
• 3bc2ad83ea
  Remove some more letters from the alphabet Charlotte Van Petegem 2022-06-03 19:12:00 +0200
• 0661016236
  Make slug eight characters Charlotte Van Petegem 2022-06-03 19:05:33 +0200
• 10327941d2
  Merge pull request #195 from ZeusWPI/base58-slugs Maxime 2022-06-01 21:26:49 +0200
• 5d204a4012 use a string, not bytes mcbloch 2022-06-01 17:36:52 +0200
• 2bdd07c9af
  Update app/models/order.py Maxime 2022-06-01 17:24:27 +0200
• 978b432d7e use base58 for slugs to remove doubt mcbloch 2022-06-01 17:18:47 +0200
• 426357f00d
  Move filtering by association to get_orders Charlotte Van Petegem 2022-05-30 20:23:14 +0200
• 5306561ddd
  
  Correct word on home page Midgard 2022-05-25 15:11:06 +0200
• 01b5c72e7b
  Generate slug in app Charlotte Van Petegem 2022-05-30 19:48:23 +0200
• 4a353ec17e
  Create a slug for old orders in the migration Midgard 2022-05-25 13:54:42 +0200
• 8f3750060b
  VARCHAR requires a length in mysql Charlotte Van Petegem 2022-05-30 18:50:46 +0200
• bb49fb2795
  Add merge migration Charlotte Van Petegem 2022-05-30 18:44:18 +0200
• 28a6dc5422
  Merge pull request #193 from ZeusWPI/feature/association-management Charlotte Van Petegem 2022-05-30 18:29:05 +0200
• 0ebb877070
  
  Create a slug for old orders in the migration slug Midgard 2022-05-25 13:54:42 +0200
• 105cf4a044
  
  Revert "Don't crash on orders that don't have a slug" Midgard 2022-05-25 13:55:31 +0200
• ff0ea068de
  
  Don't crash on orders that don't have a slug Midgard 2022-05-25 10:51:06 +0200
• 453cacebd9
  
  Add migration to add slug DB field to order Midgard 2022-05-20 20:01:34 +0200
• 44feb1a4ff
  
  Change forgotten order_id to order_slug in a few places Midgard 2022-05-20 19:41:42 +0200
• c04d9bbd44
  Fix typing of associations in user model Charlotte Van Petegem 2022-05-25 10:07:30 +0200
• 4d9d43b0f0
  Don't limit length (and fix migration) Charlotte Van Petegem 2022-05-24 21:26:51 +0200
• 0a0d13c0dc
  Merge pull request #189 from ZeusWPI/fix-float-deadline redfast00 2022-05-24 20:42:24 +0200
• 2c4a288d4e
  Merge pull request #194 from ZeusWPI/chore/stamp-db-after-init redfast00 2022-05-24 20:36:52 +0200
• da1a708e28
  List order association in admin view Charlotte Van Petegem 2022-05-20 23:29:05 +0200
• d6d9d61f27
  Remove some unused code Charlotte Van Petegem 2022-05-20 23:21:11 +0200
• a077a8038a
  Only list orders to users of its association Charlotte Van Petegem 2022-05-20 23:15:45 +0200
• 1c0d78f2ee
  Make sure only users with at least one association can create an order Charlotte Van Petegem 2022-05-20 22:46:56 +0200
• bbb38aa825
  Make sure to stamp database at latest revision after setup Charlotte Van Petegem 2022-05-20 21:59:51 +0200
• c43efa4b10
  Migration Charlotte Van Petegem 2022-05-20 21:34:18 +0200
• 8a2b9247e1
  initial work, model works, layout doenst mcbloch 2022-05-20 19:04:32 +0200
• 25e2757461
  Merge pull request #192 from ZeusWPI/chore/haldis-admins-not-admin-users redfast00 2022-05-20 20:44:32 +0200
• ab47c0a882
  Change HALDIS_ADMIN_USERS configuration key to the one actually used Charlotte Van Petegem 2022-05-20 19:32:59 +0200
• f87f3c5446
  Merge pull request #187 from ZeusWPI/feature/invitelink-token Maxime 2022-05-20 19:15:20 +0200
• a33c76f84b fix modify link mcbloch 2022-05-20 19:14:10 +0200
• 98214f8b84 Add share slug and qr code to order page mcbloch 2022-04-20 02:35:44 +0200
• 7702fdecbe change url usage to unique 7char slugs mcbloch 2022-04-20 02:05:10 +0200
• 0e0771bae1 use a more common unicode arrow that can be found in more fonts mcbloch 2022-05-20 18:17:34 +0200
• 02d52f08dd add validation check that choice options are correctly set hlds-verify-choice-option-count mcbloch 2022-05-15 00:04:50 +0200
• 749012140b
  Make deadline minutes integer instead of rounded float redfast00 2022-05-11 18:33:34 +0200
• b5202a9de6
  
  Don't crash when rendering None price Midgard 2022-05-11 02:43:08 +0200
• 7b16a3b6c5
  
  Don't crash when item.price is None Midgard 2022-05-11 02:35:38 +0200
• 03f1e56161
  
  Fix bug with form inside form Midgard 2022-05-02 22:25:06 +0200
• cf27a7de8a
  
  For loops don't work in this template engine Midgard 2022-05-02 22:04:45 +0200
• a568103a60
  
  You didn't see this Midgard 2022-05-02 22:00:37 +0200
• 85d8892176
  
  Hide buttons for which user has no permission Midgard 2022-05-02 21:56:38 +0200
• c35d107502
  
  Merge branch 'payment' Midgard 2022-05-02 21:23:33 +0200
• dfbf1de5a1 wsgi is particular about the app object mcbloch 2022-05-02 18:25:54 +0200
• fec9d660c3 Fix wsgi startup script for real mcbloch 2022-05-02 18:21:27 +0200
• 9c00fcc0cf Fix for wsgi startup script mcbloch 2022-05-02 18:18:32 +0200
• 2271b0427c Hotfix for create_database script mcbloch 2022-05-02 14:16:20 +0200
• 5a9d9c1d31
  
  Update prices per person on key up Midgard 2022-04-22 01:25:01 +0200
• ced04acb2e
  
  Remove TODO buttons Midgard 2022-04-22 01:17:32 +0200
• 09e2d704cd
  
  Add price editor Midgard 2022-04-22 01:15:54 +0200
• fc630e9061
  
  Support marking items as paid Midgard 2022-03-27 19:33:14 +0200
• e8431fcd12 Add share slug and qr code to order page feature/invitelink-token mcbloch 2022-04-20 02:35:44 +0200
• 1e0c8ed17a change url usage to unique 7char slugs mcbloch 2022-04-20 02:05:10 +0200
• 841c3d5fb8 add flag to disable microsoft login feature/microsoft-auth mcbloch 2022-04-20 01:34:19 +0200
• da88d807d1 disable printing of user info mcbloch 2022-04-20 01:28:48 +0200
• cc0c271a22 Add working microsoft login flow mcbloch 2022-04-20 01:27:52 +0200
• 0ace54a8fd
  Merge pull request #185 from ZeusWPI/fix/pylint Maxime 2022-04-19 23:59:47 +0200
• ae77adc54e Add flask factory to scope app variable mcbloch 2022-04-19 23:59:23 +0200