Commit Graph

294 Commits

Author SHA1 Message Date
2df193c6d5 fixes 2025-02-23 17:46:42 +01:00
8b9f845a37 Merge branch 'hotfix/fix_login_loop' into develop 2025-02-19 19:44:00 +01:00
f3e1620057 gitflow-hotfix-stash: fix_login_loop 2025-02-19 19:43:56 +01:00
af4c826322 Merge branch 'hotfix/debug_info_on_push_subscription' into develop 2025-02-19 16:49:56 +01:00
b52eea79c2 Merge branch 'hotfix/debug_info_on_push_subscription' 2025-02-19 16:49:56 +01:00
8972d2d72a gitflow-hotfix-stash: debug_info_on_push_subscription 2025-02-19 16:49:51 +01:00
2282bbf13d Merge branch 'hotfix/menu-more-size' into develop 2025-02-19 15:37:36 +01:00
49ed27e58f Merge branch 'hotfix/menu-more-size' menu-more-size 2025-02-19 15:37:36 +01:00
9a5d90a703 fix menu-more-size 2025-02-19 15:37:28 +01:00
7e8cbeb392 Merge branch 'hotfix/expenditures_dark_mode' into develop 2025-02-19 15:35:19 +01:00
bceca97c98 Merge branch 'hotfix/expenditures_dark_mode' expenditures_dark_mode 2025-02-19 15:35:19 +01:00
52c6914d41 fix expenditures dark mode 2025-02-19 15:35:11 +01:00
960761d729 Merge branch 'release/v1.13' into develop 2025-02-19 15:21:09 +01:00
0a323be5bf Merge branch 'release/v1.13' v1.13 2025-02-19 15:21:09 +01:00
2242cedfea release v1.13 2025-02-19 15:20:54 +01:00
69dcb13f50 Merge branch 'feature/expenditures' into develop 2025-02-19 15:18:40 +01:00
5dc88a78a2 expenditures: add: regatta_name got datalist 2025-02-19 15:18:08 +01:00
a221c86431 expenditures: Ausgleichen-Button 2025-02-19 15:05:19 +01:00
839f668b08 expenditures: added badge for open approvals 2025-02-19 14:49:21 +01:00
8f597051dd planning_edit: crew: fa-times
instead of fa-angle-right to show that by clicking the sailor will be removed
2025-02-19 14:31:45 +01:00
dd587f7603 added full expenditures functionality 2025-02-19 14:30:44 +01:00
0e501e8ba4 added table expenditures inkl sync 2025-02-18 14:02:06 +01:00
42e68e5511 changed main menu: planning <-> lists 2025-02-18 13:05:22 +01:00
2971fdd259 Merge branch 'hotfix/v1.12.1h9' v1.12.1h9 2025-02-17 13:28:49 +01:00
9360f0e943 Merge branch 'hotfix/v1.12.1h9' into develop 2025-02-17 13:28:49 +01:00
47718318ef gitflow-hotfix-stash: v1.12.1h9 2025-02-17 13:28:34 +01:00
bd4fc4c255 Merge branch 'hotfix/register_on_regatten_net' register_on_regatten_net 2025-02-17 13:26:59 +01:00
1ab0e9185f Merge branch 'hotfix/register_on_regatten_net' into develop 2025-02-17 13:26:59 +01:00
027abe5364 gitflow-hotfix-stash: register_on_regatten_net 2025-02-17 13:26:08 +01:00
ostertun
29f83814ee Merge branch 'hotfix/new_follow2' new_follow2 2024-02-18 13:19:12 +01:00
ostertun
deb23a5f7f Merge branch 'hotfix/new_follow2' into develop 2024-02-18 13:19:12 +01:00
ostertun
744be24410 gitflow-hotfix-stash: new_follow2 2024-02-18 13:19:04 +01:00
ostertun
633e39ce5d Merge branch 'hotfix/new_follow' new_follow 2024-02-18 13:14:12 +01:00
ostertun
bd2aafe67c Merge branch 'hotfix/new_follow' into develop 2024-02-18 13:14:12 +01:00
ostertun
2e6eb25e68 gitflow-hotfix-stash: new_follow 2024-02-18 13:13:55 +01:00
ostertun
dc2ead3a07 Merge branch 'hotfix/a53.2' a53.2 2023-11-27 09:21:05 +01:00
ostertun
ccc8731394 Merge branch 'hotfix/a53.2' into develop 2023-11-27 09:21:05 +01:00
ostertun
6b89acf422 gitflow-hotfix-stash: a53.2 2023-11-27 09:20:58 +01:00
ostertun
54ceae6ce0 Merge branch 'hotfix/a53' a53 2023-11-27 09:14:53 +01:00
ostertun
fe02f8707b Merge branch 'hotfix/a53' into develop 2023-11-27 09:14:52 +01:00
ostertun
a6f0c8e0f5 a53 2023-11-27 09:14:45 +01:00
ostertun
fe90438cb3 gitflow-hotfix-stash: a53 2023-11-27 09:14:19 +01:00
ostertun
8c4d2f00cd Merge branch 'temp' ranking_year2 2023-10-10 08:09:23 +02:00
ostertun
34ae418598 Merge branch 'hotfix/ranking_year2' into develop 2023-10-10 08:07:31 +02:00
ostertun
d59b384e1a gitflow-hotfix-stash: ranking_year2 2023-10-10 08:07:12 +02:00
ostertun
25df9995dd Merge branch 'hotfix/wfn_entrylist_link' wfn_entrylist_link 2023-09-04 14:26:03 +02:00
ostertun
12538aaa3f Merge branch 'hotfix/wfn_entrylist_link' into develop 2023-09-04 14:26:02 +02:00
ostertun
e087e137ff fix wfn_entrylist_link 2023-09-04 14:25:37 +02:00
ostertun
e5dc107a7d Merge branch 'hotfix/extServiceWfn' extServiceWfn 2023-04-28 21:44:27 +02:00
ostertun
fefd3c8929 Merge branch 'hotfix/extServiceWfn' into develop 2023-04-28 21:44:26 +02:00