 philipp
|
0bc00472d7
|
don't create any notification if we are working with planned_event
|
2024-04-15 18:22:58 +02:00 |
|
|
philipp
|
37da4f2c3e
|
Merge branch 'main' into staging
|
2024-04-15 18:16:57 +02:00 |
|
|
philipp
|
74505c1554
|
add notification to all pot. coxes if trip is full
|
2024-04-15 18:16:43 +02:00 |
|
|
philipp
|
1869b36e09
|
add notification on canceled trips; add explicit 'cancel trip' button
|
2024-04-15 17:17:54 +02:00 |
|
|
philipp
|
13808d0103
|
Merge pull request 'staging' (#373) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#373
|
2024-04-15 11:26:20 +02:00 |
|
|
philipp
|
4a3803df51
|
Merge branch 'main' into staging
|
2024-04-15 11:25:49 +02:00 |
|
|
philipp
|
d58d4642af
|
1x boats: don't show 'Ruderer: ' in logbook; Fixes #362
|
2024-04-15 11:23:07 +02:00 |
|
|
philipp
|
c3fa5195d3
|
Merge pull request 'hide old verified boat damages' (#372) from hide-old-verified-boatdamages into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#372
|
2024-04-14 21:40:39 +02:00 |
|
|
philipp
|
c4a9a541d3
|
Merge pull request 'don't show external boats in boatstat; hide logout in menu; move owner into own column in boatstat' (#369) from updates into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#369
|
2024-04-14 21:40:27 +02:00 |
|
|
philipp
|
8db9e020c8
|
Merge pull request 'hide old verified boat damages' (#371) from hide-old-verified-boatdamages into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#371
|
2024-04-14 20:28:42 +02:00 |
|
|
philipp
|
42277699a7
|
hide old verified boat damages
|
2024-04-14 20:28:06 +02:00 |
|
|
philipp
|
a1b78db750
|
Merge pull request 'don't show external boats in boatstat; hide logout in menu; move owner into own column in boatstat' (#368) from updates into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#368
|
2024-04-14 20:22:18 +02:00 |
|
|
philipp
|
7ebbf5661a
|
don't show external boats in boatstat; hide logout in menu; move owner into own column in boatstat
|
2024-04-14 20:20:22 +02:00 |
|
|
philipp
|
2ff08141ae
|
Merge pull request 'steering' (#367) from steering into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#367
|
2024-04-14 20:18:45 +02:00 |
|
|
philipp
|
297e0629a4
|
Merge pull request 'steering' (#366) from steering into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#366
|
2024-04-14 19:57:26 +02:00 |
|
|
philipp
|
213a80bd28
|
Merge branch 'staging' into steering
|
2024-04-14 19:56:58 +02:00 |
|
|
philipp
|
b111c4a1b9
|
lint html
|
2024-04-14 18:38:41 +02:00 |
|
 Marie Birner
|
db43ef628f
|
[TASK] style steering html
|
2024-04-14 18:36:27 +02:00 |
|
|
philipp
|
ccf9f41f4e
|
Merge branch 'staging' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into staging
|
2024-04-14 18:27:35 +02:00 |
|
|
philipp
|
fb9e694919
|
add required role
|
2024-04-14 18:27:21 +02:00 |
|
|
philipp
|
ea70170d2b
|
Merge pull request '[TASK] improve style searchable table' (#365) from js-table into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#365
|
2024-04-14 18:19:22 +02:00 |
|
 marie
|
36af52bf7e
|
Merge pull request 'js-table' (#364) from js-table into staging
Reviewed-on: Ruderverein-Donau-Linz/rowt#364
|
2024-04-14 17:56:43 +02:00 |
|
|
Marie Birner
|
0b6461eeb5
|
[TASK] improve style searchable table
|
2024-04-14 17:43:18 +02:00 |
|
|
philipp
|
b0c936cc34
|
Merge pull request 'have test users only @ staging' (#363) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#363
|
2024-04-14 17:00:53 +02:00 |
|
|
philipp
|
d51174e8fd
|
have test users only @ staging
|
2024-04-14 16:59:17 +02:00 |
|
|
philipp
|
e2a30dad52
|
Merge pull request 'staging' (#360) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#360
|
2024-04-13 09:52:24 +02:00 |
|
|
philipp
|
74d3957cf8
|
dont show external boat
|
2024-04-13 09:44:22 +02:00 |
|
|
philipp
|
cfc35fbec6
|
only show non-placed boats in boathouse list
|
2024-04-13 09:42:12 +02:00 |
|
|
philipp
|
b1d3f8ddc9
|
Merge pull request 'allow html in notifications' (#359) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#359
|
2024-04-12 11:33:26 +02:00 |
|
|
philipp
|
3b04b39d66
|
allow html in notifications
|
2024-04-12 11:32:21 +02:00 |
|
|
philipp
|
cdcb07a3f7
|
Merge pull request 'update deps' (#356) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#356
|
2024-04-09 11:25:01 +02:00 |
|
|
philipp
|
19523acc67
|
update deps
|
2024-04-09 11:24:38 +02:00 |
|
|
philipp
|
faa8e6a13b
|
Merge pull request 'fix ci' (#355) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#355
|
2024-04-09 08:08:11 +02:00 |
|
|
philipp
|
0fed206df6
|
fix ci
|
2024-04-09 08:07:56 +02:00 |
|
|
philipp
|
7660953e6b
|
Merge pull request 'don't clutter logs' (#354) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#354
|
2024-04-09 07:30:40 +02:00 |
|
|
philipp
|
4a5d9fa65b
|
don't clutter logs
|
2024-04-09 07:30:05 +02:00 |
|
|
philipp
|
83c0285204
|
Merge pull request 'staging' (#353) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#353
|
2024-04-08 23:22:24 +02:00 |
|
|
philipp
|
3823d959e8
|
add stats from nginx logs
|
2024-04-08 23:21:35 +02:00 |
|
|
philipp
|
6c302712d4
|
add stats from nginx logs
|
2024-04-08 23:20:33 +02:00 |
|
|
philipp
|
f93677b420
|
add stats from nginx logs
|
2024-04-08 23:19:59 +02:00 |
|
|
philipp
|
23cd62820c
|
Merge pull request 'only show notifications from last 2 weeks' (#352) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#352
|
2024-04-08 20:25:37 +02:00 |
|
|
philipp
|
39d410b050
|
only show notifications from last 2 weeks
|
2024-04-08 20:25:13 +02:00 |
|
|
philipp
|
61c67d78da
|
Merge pull request 'allow admin to send notifications' (#351) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#351
|
2024-04-08 19:36:35 +02:00 |
|
|
philipp
|
64d32e2688
|
allow admin to send notifications
|
2024-04-08 19:35:31 +02:00 |
|
|
philipp
|
1aba6948ee
|
Merge pull request 'only allow people with 'donau linz' role to be in logbook' (#350) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#350
|
2024-04-08 19:05:29 +02:00 |
|
|
philipp
|
3b9103e9aa
|
fix membership application error
|
2024-04-08 19:04:57 +02:00 |
|
|
philipp
|
db3158d4e7
|
only allow people with 'donau linz' role to be in logbook
|
2024-04-07 23:17:06 +02:00 |
|
|
philipp
|
08a970853a
|
Merge pull request 'better text for boat reservation' (#349) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#349
|
2024-04-07 22:13:32 +02:00 |
|
|
philipp
|
7cbfafa5c5
|
better text for boat reservation
|
2024-04-07 22:12:56 +02:00 |
|
|
philipp
|
c64f392fe7
|
Merge pull request 'improve header of list' (#348) from staging into main
Reviewed-on: Ruderverein-Donau-Linz/rowt#348
|
2024-04-07 20:12:22 +02:00 |
|