Commit Graph

2836 Commits

Author SHA1 Message Date
philipp 1ecde79593 fix notification
CI/CD Pipeline / test (push) Successful in 17m3s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2025-05-10 15:47:25 +02:00
philipp e8b8ba393f Merge pull request 'inform new cox about things' (#1004) from informat-new-cox into main
CI/CD Pipeline / test (push) Successful in 16m8s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 8m24s
Reviewed-on: #1004
2025-05-09 13:06:29 +02:00
philipp e01f9806bd Merge pull request 'inform new cox about things' (#1003) from informat-new-cox into staging
CI/CD Pipeline / test (push) Successful in 16m25s
CI/CD Pipeline / deploy-staging (push) Successful in 8m17s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #1003
2025-05-09 13:05:31 +02:00
philipp 3801c7ce8c inform new cox about things
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2025-05-09 13:04:51 +02:00
philipp 816257d4be Merge pull request 'remove notes from users (switched to activity)' (#1002) from remove-notes into main
CI/CD Pipeline / test (push) Successful in 18m20s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 9m39s
Reviewed-on: #1002
2025-05-09 08:57:45 +02:00
philipp 71087af0df Merge pull request 'remove-notes' (#1001) from remove-notes into staging
CI/CD Pipeline / test (push) Successful in 18m4s
CI/CD Pipeline / deploy-staging (push) Successful in 9m50s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #1001
2025-05-09 08:45:15 +02:00
philipp 23399b7757 remove notes from users (switched to activity)
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2025-05-09 08:44:17 +02:00
philipp 0c5812f725 Merge pull request 'show all activities for admin; Fixes #984' (#1000) from show-all-activities into main
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
Reviewed-on: #1000
2025-05-09 08:32:33 +02:00
philipp 6efcaaccf9 Merge pull request 'show-all-activities' (#999) from show-all-activities into staging
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
Reviewed-on: #999
2025-05-09 08:32:14 +02:00
philipp d88a35bb82 show all activities for admin; Fixes #984
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2025-05-09 08:30:09 +02:00
philipp 52abcbb3fb Merge pull request 'show proper text for all who have acheived diamond equatorprice' (#998) from fix-diamond-text into main
CI/CD Pipeline / test (push) Successful in 16m51s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 20m36s
Reviewed-on: #998
2025-05-07 13:44:47 +02:00
philipp 60578dfaba Merge pull request 'fix-diamond-text' (#997) from fix-diamond-text into staging
CI/CD Pipeline / test (push) Successful in 15m37s
CI/CD Pipeline / deploy-staging (push) Successful in 9m29s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #997
2025-05-07 13:44:43 +02:00
philipp 29777cdc36 show proper text for all who have acheived diamond equatorprice
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2025-05-07 13:43:57 +02:00
philipp 22b9a2e324 Merge pull request '[TASK] add search bar and improve ux' (#996) from improve-role-view into main
CI/CD Pipeline / test (push) Successful in 15m33s
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
Reviewed-on: #996
2025-05-07 13:06:39 +02:00
philipp addf0f437b Merge pull request 'improve-role-view' (#995) from improve-role-view into staging
CI/CD Pipeline / test (push) Successful in 15m40s
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
Reviewed-on: #995
2025-05-07 13:06:33 +02:00
philipp a97d515f03 lint
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2025-05-07 13:06:02 +02:00
Marie Birner 72fc3ed91e [TASK] add search bar and improve ux
CI/CD Pipeline / test (push) Successful in 16m18s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2025-05-07 11:52:58 +02:00
philipp b079eafc3d Merge pull request 'update deps' (#994) from upd into main
CI/CD Pipeline / test (push) Failing after 24m48s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #994
2025-05-06 22:51:56 +02:00
philipp 51df7f2d1e Merge pull request 'upd' (#993) from upd into staging
CI/CD Pipeline / test (push) Successful in 30m10s
CI/CD Pipeline / deploy-staging (push) Successful in 24m9s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #993
2025-05-06 22:51:06 +02:00
philipp 6e1bfe8635 update deps
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2025-05-06 22:49:51 +02:00
philipp ce28f93d65 Merge pull request 'single-user-edit-page' (#992) from single-user-edit-page into main
CI/CD Pipeline / test (push) Successful in 14m40s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 13m21s
Reviewed-on: #992
2025-05-06 13:43:23 +02:00
philipp 78faf1b0db Merge pull request 'single-user-edit-page' (#991) from single-user-edit-page into staging
CI/CD Pipeline / test (push) Successful in 15m12s
CI/CD Pipeline / deploy-staging (push) Successful in 7m17s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #991
2025-05-06 13:40:59 +02:00
philipp bf3a4c686a Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2025-05-06 13:40:39 +02:00
philipp 5fb9e0fbba format 2025-05-06 13:40:33 +02:00
philipp e3fc756b3f Merge pull request 'single-user-edit-page' (#990) from single-user-edit-page into staging
CI/CD Pipeline / test (push) Successful in 14m43s
CI/CD Pipeline / deploy-staging (push) Successful in 13m5s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #990
2025-05-06 10:14:55 +02:00
Marie Birner f58e7d1307 Merge commit '374fed9e3bdcee30a3f8315d1f0c392204a885df' into single-user-edit-page
CI/CD Pipeline / test (push) Successful in 14m45s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2025-05-06 09:57:02 +02:00
philipp 374fed9e3b fix tests by clicking on boat name instead of cox
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2025-05-06 08:50:45 +02:00
Marie Birner b9f2382cba [BUGFIX] buttons mobile margin 2025-05-06 07:45:32 +02:00
Marie Birner aab3a15488 [BUGFIX] back link margin bottom mobile 2025-05-06 07:44:12 +02:00
philipp 83b93fba09 Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page
CI/CD Pipeline / test (push) Failing after 22m20s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2025-05-05 22:24:32 +02:00
philipp 3b5ff70d1d don't clutter acitvities toooooo much 2025-05-05 22:23:28 +02:00
philipp 2af9ac20b1 Merge pull request '[TASK] add icons to add new user and improve ui in setting a fixed height in activity log' (#989) from improve-user-view into single-user-edit-page
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #989
2025-05-05 22:16:11 +02:00
Marie Birner 5331ac71fa [TASK] add icons to add new user and improve ui in setting a fixed height in activity log
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2025-05-05 22:12:19 +02:00
philipp 6098aedb74 fix tests?
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2025-05-05 22:11:56 +02:00
Marie Birner af2e7cb557 Merge commit '17513bbc386e849962157517d9a4496870b1a064' into single-user-edit-page
CI/CD Pipeline / test (push) Failing after 22m54s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2025-05-05 21:14:41 +02:00
Marie Birner 81b99ef414 [TASK] edit form on logbook fixes #635 2025-05-05 21:14:23 +02:00
philipp 17513bbc38 give frontend stuff to be able to update logbook entriese
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2025-05-05 21:11:41 +02:00
philipp c1cecf3b20 don't panic on 'external cox'
CI/CD Pipeline / test (push) Successful in 16m19s
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2025-05-05 20:46:41 +02:00
philipp 8e40e563c6 even less clutter!
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2025-05-05 20:44:00 +02:00
Marie Birner bb78441cc4 Merge branch 'single-user-edit-page' of https://git.hofer.link/Ruderverein-Donau-Linz/rowt into single-user-edit-page
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2025-05-05 20:37:45 +02:00
Marie Birner abcf46281b [TASK] style detail view user 2025-05-05 20:37:29 +02:00
philipp c460494be8 Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2025-05-05 20:37:20 +02:00
philipp 7083d27644 Merge pull request 'single-user-edit-page' (#986) from single-user-edit-page into staging
CI/CD Pipeline / test (push) Successful in 16m24s
CI/CD Pipeline / deploy-staging (push) Successful in 8m23s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #986
2025-05-05 20:37:12 +02:00
philipp e5560ba536 don't clutter acitvities too much 2025-05-05 20:37:12 +02:00
Marie Birner b7094bff06 Merge branch 'single-user-edit-page' of https://git.hofer.link/Ruderverein-Donau-Linz/rowt into single-user-edit-page
CI/CD Pipeline / test (push) Successful in 15m54s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2025-05-05 20:21:11 +02:00
Marie Birner 6b8b4ba1d2 [TASK] style new user action in list view 2025-05-05 20:20:52 +02:00
philipp 03f76b1ae5 Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page
CI/CD Pipeline / test (push) Successful in 14m58s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2025-05-05 20:01:48 +02:00
philipp 1864ea260c allow to edit roles 2025-05-05 20:01:32 +02:00
Marie Birner 35a5a55140 [TASK] change background color dark view
CI/CD Pipeline / test (push) Successful in 14m39s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2025-05-05 19:44:11 +02:00
philipp 9a4dcc0b9d create activity for 'user deleted'; Fixes #985
CI/CD Pipeline / test (push) Successful in 16m45s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2025-05-05 18:23:31 +02:00