Commit Graph

Select branches

Hide Pull Requests

main

#12

#6

#7

#8

#9

test

Mono Color

• 251c83eb30 Merge pull request 'show guests km' (#147) from show-guests-km into main philipp 2024-01-05 20:09:59 +01:00
• 323f6da201 Merge pull request 'show guests km' (#146) from show-guests-km into staging philipp 2024-01-05 20:08:47 +01:00
• 0aeec175ac show guests km philipp 2024-01-05 20:08:13 +01:00
• 2e91925b83 Merge pull request 'fix tests, as we now show all boats in kiosk mode' (#143) from fix-ci into main philipp 2024-01-04 20:48:11 +01:00
• 248ab95ae9 Merge pull request 'fix tests, as we now show all boats in kiosk mode' (#142) from fix-ci into staging philipp 2024-01-04 20:47:47 +01:00
• 1cfbb97034 fix tests, as we now show all boats in kiosk mode philipp 2024-01-04 20:46:49 +01:00
• 2726db433e Merge pull request 'allow to add logbook entries up to a week late; show all boats in boatshouse; don't show guests for external boats' (#141) from fixes into main philipp 2024-01-04 20:44:26 +01:00
• 571e80085f Merge pull request 'allow to add logbook entries up to a week late; show all boats in boatshouse; don't show guests for external boats' (#140) from fixes into staging philipp 2024-01-04 20:44:06 +01:00
• bada4deedd allow to add logbook entries up to a week late; show all boats in boatshouse; don't show guests for external boats philipp 2024-01-04 20:43:38 +01:00
• b73ae788e6 Merge pull request 'fix weird iphone issue' (#137) from fix-weird-iphone-issue into staging philipp 2024-01-03 10:00:10 +01:00
• 86075b72c6 Merge pull request 'fix weird iphone issue' (#136) from fix-weird-iphone-issue into main philipp 2024-01-03 09:59:50 +01:00
• f5bfb9fbdf fix weird iphone issue philipp 2024-01-03 09:59:09 +01:00
• 5b087baf02 Merge pull request 'staging' (#125) from staging into main philipp 2024-01-01 21:05:58 +01:00
• 25d48241ee Merge pull request 'main' (#124) from main into staging philipp 2024-01-01 21:05:13 +01:00
• cade5e1dfc Merge pull request 'fix-boatdamage' (#123) from fix-boatdamage into main philipp 2024-01-01 18:55:37 +01:00
• 4430e7413f Merge pull request 'fix boat damage show' (#122) from fix-boatdamage into staging philipp 2024-01-01 18:55:13 +01:00
• e925fadbb8 fix boat damage show philipp 2024-01-01 18:54:44 +01:00
• ecb522bd98 Merge pull request 'fix' (#119) from fix into main philipp 2024-01-01 18:37:03 +01:00
• 9c9840ad5a Merge branch 'fix' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into fix philipp 2024-01-01 18:36:34 +01:00
• 781fb8e952 push philipp 2024-01-01 17:53:00 +01:00
• 54e02b7ea1 push philipp 2024-01-01 17:51:23 +01:00
• 827613ca7c fix ci philipp 2024-01-01 17:25:35 +01:00
• 945b96c55d Merge pull request 'push' (#121) from fix into staging philipp 2024-01-01 17:53:31 +01:00
• 4797d242a1 push philipp 2024-01-01 17:53:00 +01:00
• d1420961a0 Merge pull request 'push' (#120) from fix into staging philipp 2024-01-01 17:51:45 +01:00
• f4896f4d80 push philipp 2024-01-01 17:51:23 +01:00
• b916b9783b Merge pull request 'fix ci' (#118) from fix into staging philipp 2024-01-01 17:26:00 +01:00
• 71926ad4b9 fix ci philipp 2024-01-01 17:25:35 +01:00
• 78bd9a91f0 Merge pull request 'update' (#117) from update into main philipp 2024-01-01 16:52:33 +01:00
• a557b8cfbd Merge pull request 'update deps' (#116) from update-deps into main philipp 2024-01-01 16:51:27 +01:00
• aad947009f Merge pull request 'update deps' (#115) from update-deps into staging philipp 2024-01-01 16:50:58 +01:00
• 998054ab68 update deps philipp 2024-01-01 16:50:34 +01:00
• 29e7142883 Merge pull request 'main' (#111) from main into staging philipp 2024-01-01 16:30:52 +01:00
• 1f44b73b3b Merge pull request 'push' (#110) from update into staging philipp 2024-01-01 16:29:06 +01:00
• 24608c3da9 push philipp 2024-01-01 16:28:31 +01:00
• 6bbe1302d9 Merge pull request 'nxdata' (#109) from nxdata into main philipp 2024-01-01 15:51:16 +01:00
• 99d5328831 Merge pull request 'add mail' (#108) from mail into staging philipp 2024-01-01 15:50:44 +01:00
• 0ad342b147 add mail philipp 2024-01-01 15:50:06 +01:00
• 8b154b9675 Merge pull request 'better filter:' (#107) from nxdata into staging philipp 2023-12-30 21:30:48 +01:00
• cf5b2751dd better filter: philipp 2023-12-30 21:30:27 +01:00
• 640f6bd0e7 Merge pull request 'add data from nx' (#106) from nxdata into staging philipp 2023-12-30 21:22:11 +01:00
• 5800f137f3 add data from nx philipp 2023-12-30 21:21:30 +01:00
• 415ac4f8d4 remove migration, as it is deployed on main philipp 2023-12-30 17:47:25 +01:00
• f27e76f328 Merge pull request 'groups' (#104) from groups into main philipp 2023-12-30 17:14:02 +01:00
• c9c7ad967d push philipp 2023-12-30 17:13:21 +01:00
• a17ac5f1b5 fix seeds philipp 2023-12-23 22:14:24 +01:00
• 9fb4167b50 in preparation to moving userdata into app, we switched to arbitrary groups philipp 2023-12-23 21:27:52 +01:00
• 7e625cd5a5 Merge pull request 'fix error where joining cox to planned_event is not dispaying properly. The problem was the restructuring commit 7569798b00 (diff-0496fd5ec13efcfc97602dc5784170a0dd1)…' (#103) from fix-cox-join-staging into staging philipp 2023-12-28 18:20:19 +01:00
• 34280dbbea fix error where joining cox to planned_event is not dispaying properly. The problem was the restructuring commit 7569798b00 (diff-0496fd5ec13efcfc97602dc5784170a0dd124e6e) where I compared different ids philipp 2023-12-28 18:19:43 +01:00
• 54c013ec10 Merge pull request 'fix error where joining cox to planned_event is not dispaying properly. The problem was the restructuring commit 7569798b00 (diff-0496fd5ec13efcfc97602dc5784170a0dd1)…' (#101) from fix-cox-join into main philipp 2023-12-28 18:15:09 +01:00
• a9fbb05944 fix error where joining cox to planned_event is not dispaying properly. The problem was the restructuring commit 7569798b00 (diff-0496fd5ec13efcfc97602dc5784170a0dd124e6e) where I compared different ids philipp 2023-12-28 18:14:11 +01:00
• 44bc217452 Merge pull request 'show guest km, Fixes #41' (#99) from guest-km into main philipp 2023-12-23 22:30:27 +01:00
• 990a62fe16 Merge pull request 'fix seeds' (#98) from groups into staging philipp 2023-12-23 22:14:45 +01:00
• 411eea179c fix seeds philipp 2023-12-23 22:14:24 +01:00
• 108242139a Merge pull request 'in preparation to moving userdata into app, we switched to arbitrary groups' (#97) from groups into staging philipp 2023-12-23 21:30:02 +01:00
• c7d7d0ca83 in preparation to moving userdata into app, we switched to arbitrary groups philipp 2023-12-23 21:27:52 +01:00
• e4da952a62 Merge pull request 'show guest km, Fixes #41' (#95) from guest-km into staging philipp 2023-12-23 15:28:00 +01:00
• aca5340370 show guest km, Fixes #41 philipp 2023-12-23 15:26:49 +01:00
• d586f37cbe Merge pull request 'update-deps' (#94) from update-deps into main philipp 2023-12-23 13:19:35 +01:00
• 1c9da6815e Merge pull request 'update deps' (#93) from update-deps into staging philipp 2023-12-23 13:18:54 +01:00
• 1a24d1fad5 update deps philipp 2023-12-23 13:17:23 +01:00
• 58943bd4e2 Merge pull request 'cleaner code' (#92) from cleaner-code into main philipp 2023-12-01 10:11:17 +01:00
• 70e209f1ce Merge pull request 'cleaner-code' (#91) from cleaner-code into staging philipp 2023-12-01 10:10:55 +01:00
• e081c7a31f cleaner code philipp 2023-12-01 10:10:18 +01:00
• 7193760f05 Merge pull request 'cleaner code thanks to clippy' (#90) from cleaner-code into main philipp 2023-11-27 12:51:23 +01:00
• 9be23ff723 Merge pull request 'cleaner-code' (#89) from cleaner-code into staging philipp 2023-11-27 12:50:59 +01:00
• 861262b62b cleaner code thanks to clippy philipp 2023-11-27 12:49:36 +01:00
• f408d4a181 Merge pull request 'update-deps' (#88) from update-deps into staging philipp 2023-11-27 11:59:02 +01:00
• 99fb9c624d Merge pull request 'fix ci' (#87) from update-deps into main philipp 2023-11-27 11:58:49 +01:00
• a2ca26fef3 fix ci philipp 2023-11-27 11:58:02 +01:00
• e87ee53512 update deps philipp 2023-11-27 09:26:32 +01:00
• e714d18551 Merge pull request 'update deps' (#85) from update-deps into main philipp 2023-11-27 09:29:14 +01:00
• b4d22cfdb1 update deps philipp 2023-11-27 09:26:32 +01:00
• d626486e55 Merge pull request 'push' (#83) from update-deps-rocket into main philipp 2023-11-22 14:06:14 +01:00
• d411127aa3 Merge pull request 'push' (#82) from update-deps-rocket into staging philipp 2023-11-22 14:05:41 +01:00
• f5dc09adea push philipp 2023-11-22 14:05:05 +01:00
• b840507051 Merge pull request 'update-sqlx' (#81) from update-sqlx into main philipp 2023-11-22 14:03:57 +01:00
• 3cac53724a Merge branch 'main' into update-sqlx philipp 2023-11-22 14:03:29 +01:00
• 9a3f857936 Merge pull request 'upgrade sqlx to 0.7 Fixes #76 restructure registrations' (#80) from update-sqlx into staging philipp 2023-11-22 13:23:10 +01:00
• 7569798b00 upgrade sqlx to 0.7 Fixes #76 restructure registrations philipp 2023-11-22 13:19:31 +01:00
• 3bbc9e5614 Merge pull request 'update deps' (#78) from update-deps into main philipp 2023-11-21 14:16:20 +01:00
• ab6ab4af8d Merge pull request 'update-deps' (#77) from update-deps into staging philipp 2023-11-21 14:16:15 +01:00
• 51d0c5c260 update deps philipp 2023-11-21 11:41:35 +01:00
• 4ffe3deb54 Merge pull request 'fix query' (#75) from fix-query into main philipp 2023-11-20 23:45:45 +01:00
• 8250881764 Merge pull request 'fix-query' (#74) from fix-query into staging philipp 2023-11-20 23:45:22 +01:00
• 2dd3885ba0 fix query philipp 2023-11-20 23:44:08 +01:00
• 4737663e8d Merge pull request 'years-changeable' (#72) from years-changeable into main philipp 2023-11-20 19:46:14 +01:00
• 4297c8e971 Merge pull request 'add css magic from marie' (#73) from years-changeable into staging philipp 2023-11-20 18:43:04 +01:00
• 72aeeb5eab add css magic from marie philipp 2023-11-20 18:42:32 +01:00
• f730dc74df Merge pull request 'fix typo' (#71) from fix-typo into main philipp 2023-11-20 17:55:45 +01:00
• 2b427438b8 Merge pull request 'fix-typo' (#70) from fix-typo into staging philipp 2023-11-20 17:55:11 +01:00
• c2f3c541fd fix typo philipp 2023-11-20 17:54:41 +01:00
• 08a48a64dc Merge pull request 'make years in stat changeable' (#69) from years-changeable into staging philipp 2023-11-20 17:53:26 +01:00
• 9ef1cd3459 make years in stat changeable philipp 2023-11-20 17:52:10 +01:00
• e9472eff01 is in master :-) philipp 2023-11-20 17:22:26 +01:00
• 77aae9eb89 Merge pull request 'efa-data' (#66) from efa-data into staging philipp 2023-11-20 16:02:40 +01:00
• 57bcad0b23 remove weird floats philipp 2023-11-20 15:50:07 +01:00
• 93852b4150 add efa data 2019-2021 philipp 2023-11-20 15:47:53 +01:00
• a17c120ebe Merge pull request 'log-2022' (#64) from log-2022 into main philipp 2023-11-20 10:11:04 +01:00
• 42cffe117c added 2022 to main philipp 2023-11-20 10:10:24 +01:00