Commit Graph
Select branches
Hide Pull Requests
improve-logbook-entry-update
main
staging
#1000
#1001
#1002
#1003
#1004
#1006
#1007
#1008
#1009
#101
#1012
#1013
#1014
#1015
#1016
#1018
#1019
#102
#1020
#1021
#1022
#1023
#1024
#1025
#1026
#1027
#1028
#1029
#103
#1031
#1032
#1033
#1034
#1035
#1036
#1037
#1038
#1039
#104
#1040
#1041
#1042
#1043
#1044
#1045
#1046
#1047
#1048
#1049
#1050
#1051
#1052
#1053
#1054
#1056
#1057
#1058
#106
#1060
#1061
#1062
#1063
#1065
#1066
#1067
#1068
#1069
#107
#1070
#1071
#1072
#1073
#1075
#1076
#1077
#1079
#108
#1080
#1081
#1084
#1085
#1086
#1087
#1089
#109
#1090
#1091
#110
#111
#115
#116
#117
#118
#119
#120
#121
#122
#123
#124
#125
#136
#137
#140
#141
#142
#143
#146
#147
#148
#149
#150
#151
#152
#153
#154
#155
#156
#157
#158
#159
#160
#163
#164
#166
#167
#168
#169
#170
#171
#172
#173
#174
#175
#176
#177
#178
#180
#181
#189
#190
#191
#193
#194
#195
#196
#197
#198
#201
#203
#205
#206
#207
#208
#209
#210
#211
#212
#213
#214
#215
#216
#218
#219
#222
#224
#225
#226
#227
#228
#229
#230
#231
#232
#233
#235
#236
#237
#238
#239
#241
#242
#243
#244
#245
#246
#248
#249
#250
#251
#252
#253
#254
#255
#256
#257
#258
#259
#260
#262
#263
#264
#265
#266
#267
#268
#269
#270
#273
#275
#276
#277
#278
#279
#280
#281
#282
#283
#284
#285
#286
#287
#288
#289
#290
#291
#292
#293
#294
#295
#296
#297
#298
#299
#300
#301
#302
#303
#304
#305
#306
#307
#311
#312
#313
#314
#316
#317
#318
#319
#320
#323
#324
#325
#326
#327
#330
#331
#332
#333
#334
#335
#336
#337
#338
#339
#340
#341
#342
#343
#344
#345
#346
#347
#348
#349
#350
#351
#352
#353
#354
#355
#356
#359
#363
#364
#365
#366
#367
#368
#369
#371
#372
#373
#374
#375
#376
#377
#378
#379
#380
#381
#383
#384
#385
#386
#387
#388
#389
#390
#391
#392
#393
#394
#395
#396
#397
#398
#399
#400
#401
#402
#403
#404
#405
#407
#408
#409
#410
#411
#412
#413
#414
#415
#416
#419
#420
#421
#422
#423
#424
#425
#426
#427
#428
#429
#430
#431
#432
#433
#434
#435
#436
#437
#438
#439
#440
#441
#442
#444
#445
#446
#447
#450
#451
#452
#453
#456
#457
#458
#459
#460
#461
#465
#466
#467
#469
#470
#471
#472
#473
#474
#475
#476
#477
#478
#479
#480
#481
#482
#483
#486
#487
#489
#490
#491
#492
#493
#494
#496
#497
#498
#499
#500
#501
#504
#505
#507
#508
#509
#510
#511
#512
#513
#514
#515
#516
#517
#518
#520
#521
#522
#524
#525
#526
#527
#528
#529
#531
#532
#533
#534
#535
#536
#537
#538
#539
#540
#543
#544
#545
#546
#547
#548
#549
#550
#553
#554
#555
#556
#557
#558
#559
#560
#562
#563
#564
#565
#566
#567
#568
#569
#570
#571
#572
#573
#574
#575
#576
#577
#578
#579
#580
#581
#582
#583
#584
#585
#586
#587
#588
#589
#590
#591
#592
#593
#594
#595
#596
#597
#598
#599
#600
#601
#602
#603
#604
#605
#606
#607
#608
#609
#610
#611
#612
#614
#615
#617
#618
#623
#624
#626
#627
#628
#629
#63
#630
#631
#632
#633
#634
#636
#637
#639
#64
#640
#641
#642
#643
#644
#647
#648
#649
#65
#651
#652
#653
#654
#655
#656
#657
#658
#659
#66
#660
#661
#662
#663
#664
#665
#666
#668
#669
#67
#670
#671
#672
#673
#674
#675
#676
#677
#678
#679
#680
#681
#682
#683
#684
#685
#686
#687
#689
#69
#690
#692
#693
#694
#695
#696
#697
#698
#699
#70
#701
#702
#703
#704
#705
#706
#707
#708
#709
#71
#710
#711
#712
#713
#714
#715
#716
#717
#718
#719
#72
#720
#721
#722
#724
#725
#729
#73
#730
#731
#732
#733
#734
#735
#736
#737
#738
#739
#74
#740
#741
#742
#743
#744
#748
#749
#75
#750
#751
#752
#753
#756
#757
#760
#761
#762
#763
#764
#767
#768
#769
#77
#770
#771
#772
#773
#774
#775
#777
#778
#779
#78
#780
#781
#782
#783
#784
#785
#786
#788
#789
#790
#791
#792
#793
#794
#795
#796
#797
#798
#799
#80
#800
#801
#802
#803
#804
#805
#807
#808
#809
#81
#810
#811
#812
#813
#814
#815
#816
#817
#818
#819
#82
#820
#821
#822
#823
#824
#825
#826
#827
#828
#829
#83
#830
#831
#832
#833
#834
#835
#836
#837
#838
#839
#840
#841
#842
#843
#844
#845
#846
#847
#848
#849
#85
#850
#851
#852
#853
#854
#855
#856
#857
#858
#859
#860
#861
#862
#863
#864
#865
#868
#869
#87
#870
#871
#872
#873
#877
#878
#879
#88
#880
#881
#882
#883
#884
#885
#886
#89
#892
#893
#895
#896
#897
#898
#899
#90
#900
#901
#902
#903
#905
#906
#907
#91
#915
#916
#919
#92
#920
#921
#922
#923
#924
#925
#927
#928
#929
#93
#930
#931
#932
#933
#934
#935
#936
#94
#944
#945
#946
#947
#948
#949
#95
#960
#961
#966
#967
#968
#97
#970
#971
#973
#975
#977
#978
#98
#986
#989
#99
#990
#991
#992
#993
#994
#995
#996
#997
#998
#999
test
Select branches
Hide Pull Requests
improve-logbook-entry-update
main
staging
#1000
#1001
#1002
#1003
#1004
#1006
#1007
#1008
#1009
#101
#1012
#1013
#1014
#1015
#1016
#1018
#1019
#102
#1020
#1021
#1022
#1023
#1024
#1025
#1026
#1027
#1028
#1029
#103
#1031
#1032
#1033
#1034
#1035
#1036
#1037
#1038
#1039
#104
#1040
#1041
#1042
#1043
#1044
#1045
#1046
#1047
#1048
#1049
#1050
#1051
#1052
#1053
#1054
#1056
#1057
#1058
#106
#1060
#1061
#1062
#1063
#1065
#1066
#1067
#1068
#1069
#107
#1070
#1071
#1072
#1073
#1075
#1076
#1077
#1079
#108
#1080
#1081
#1084
#1085
#1086
#1087
#1089
#109
#1090
#1091
#110
#111
#115
#116
#117
#118
#119
#120
#121
#122
#123
#124
#125
#136
#137
#140
#141
#142
#143
#146
#147
#148
#149
#150
#151
#152
#153
#154
#155
#156
#157
#158
#159
#160
#163
#164
#166
#167
#168
#169
#170
#171
#172
#173
#174
#175
#176
#177
#178
#180
#181
#189
#190
#191
#193
#194
#195
#196
#197
#198
#201
#203
#205
#206
#207
#208
#209
#210
#211
#212
#213
#214
#215
#216
#218
#219
#222
#224
#225
#226
#227
#228
#229
#230
#231
#232
#233
#235
#236
#237
#238
#239
#241
#242
#243
#244
#245
#246
#248
#249
#250
#251
#252
#253
#254
#255
#256
#257
#258
#259
#260
#262
#263
#264
#265
#266
#267
#268
#269
#270
#273
#275
#276
#277
#278
#279
#280
#281
#282
#283
#284
#285
#286
#287
#288
#289
#290
#291
#292
#293
#294
#295
#296
#297
#298
#299
#300
#301
#302
#303
#304
#305
#306
#307
#311
#312
#313
#314
#316
#317
#318
#319
#320
#323
#324
#325
#326
#327
#330
#331
#332
#333
#334
#335
#336
#337
#338
#339
#340
#341
#342
#343
#344
#345
#346
#347
#348
#349
#350
#351
#352
#353
#354
#355
#356
#359
#363
#364
#365
#366
#367
#368
#369
#371
#372
#373
#374
#375
#376
#377
#378
#379
#380
#381
#383
#384
#385
#386
#387
#388
#389
#390
#391
#392
#393
#394
#395
#396
#397
#398
#399
#400
#401
#402
#403
#404
#405
#407
#408
#409
#410
#411
#412
#413
#414
#415
#416
#419
#420
#421
#422
#423
#424
#425
#426
#427
#428
#429
#430
#431
#432
#433
#434
#435
#436
#437
#438
#439
#440
#441
#442
#444
#445
#446
#447
#450
#451
#452
#453
#456
#457
#458
#459
#460
#461
#465
#466
#467
#469
#470
#471
#472
#473
#474
#475
#476
#477
#478
#479
#480
#481
#482
#483
#486
#487
#489
#490
#491
#492
#493
#494
#496
#497
#498
#499
#500
#501
#504
#505
#507
#508
#509
#510
#511
#512
#513
#514
#515
#516
#517
#518
#520
#521
#522
#524
#525
#526
#527
#528
#529
#531
#532
#533
#534
#535
#536
#537
#538
#539
#540
#543
#544
#545
#546
#547
#548
#549
#550
#553
#554
#555
#556
#557
#558
#559
#560
#562
#563
#564
#565
#566
#567
#568
#569
#570
#571
#572
#573
#574
#575
#576
#577
#578
#579
#580
#581
#582
#583
#584
#585
#586
#587
#588
#589
#590
#591
#592
#593
#594
#595
#596
#597
#598
#599
#600
#601
#602
#603
#604
#605
#606
#607
#608
#609
#610
#611
#612
#614
#615
#617
#618
#623
#624
#626
#627
#628
#629
#63
#630
#631
#632
#633
#634
#636
#637
#639
#64
#640
#641
#642
#643
#644
#647
#648
#649
#65
#651
#652
#653
#654
#655
#656
#657
#658
#659
#66
#660
#661
#662
#663
#664
#665
#666
#668
#669
#67
#670
#671
#672
#673
#674
#675
#676
#677
#678
#679
#680
#681
#682
#683
#684
#685
#686
#687
#689
#69
#690
#692
#693
#694
#695
#696
#697
#698
#699
#70
#701
#702
#703
#704
#705
#706
#707
#708
#709
#71
#710
#711
#712
#713
#714
#715
#716
#717
#718
#719
#72
#720
#721
#722
#724
#725
#729
#73
#730
#731
#732
#733
#734
#735
#736
#737
#738
#739
#74
#740
#741
#742
#743
#744
#748
#749
#75
#750
#751
#752
#753
#756
#757
#760
#761
#762
#763
#764
#767
#768
#769
#77
#770
#771
#772
#773
#774
#775
#777
#778
#779
#78
#780
#781
#782
#783
#784
#785
#786
#788
#789
#790
#791
#792
#793
#794
#795
#796
#797
#798
#799
#80
#800
#801
#802
#803
#804
#805
#807
#808
#809
#81
#810
#811
#812
#813
#814
#815
#816
#817
#818
#819
#82
#820
#821
#822
#823
#824
#825
#826
#827
#828
#829
#83
#830
#831
#832
#833
#834
#835
#836
#837
#838
#839
#840
#841
#842
#843
#844
#845
#846
#847
#848
#849
#85
#850
#851
#852
#853
#854
#855
#856
#857
#858
#859
#860
#861
#862
#863
#864
#865
#868
#869
#87
#870
#871
#872
#873
#877
#878
#879
#88
#880
#881
#882
#883
#884
#885
#886
#89
#892
#893
#895
#896
#897
#898
#899
#90
#900
#901
#902
#903
#905
#906
#907
#91
#915
#916
#919
#92
#920
#921
#922
#923
#924
#925
#927
#928
#929
#93
#930
#931
#932
#933
#934
#935
#936
#94
#944
#945
#946
#947
#948
#949
#95
#960
#961
#966
#967
#968
#97
#970
#971
#973
#975
#977
#978
#98
#986
#989
#99
#990
#991
#992
#993
#994
#995
#996
#997
#998
#999
test
-
28acee3085
notifications
philipp
2023-11-17 10:30:30 +01:00 -
7ce535f500
Merge pull request 'staging' (#226) from staging into main
philipp
2024-03-04 10:03:14 +01:00 -
e338c78d04
Merge pull request 'allow vorstand to see member details, Fixes #199' (#225) from show-members-vorstand into staging
philipp
2024-03-04 09:56:29 +01:00 -
0de21e9abb
add tests and fix npm build, make frontend tests work @ mobile view
philipp
2024-03-04 09:55:39 +01:00 -
9c3ae7434e
allow vorstand to see member details, Fixes #199
philipp
2024-03-04 09:19:04 +01:00 -
996fcdc14f
Merge pull request 'Allow 'Rennjugend' to use all boats in ottensheim, Fixes #200' (#222) from ottensheim-boats into staging
philipp
2024-03-03 20:06:29 +01:00 -
5781937bee
show ottensheim boats to rennjugend
philipp
2024-03-03 20:03:20 +01:00 -
d1296ec40a
show ottensheim boats to rennjugend
philipp
2024-03-03 18:08:15 +01:00 -
29284b30a6
Merge pull request 'update deps and fix ci' (#219) from staging into main
philipp
2024-03-01 09:09:34 +01:00 -
cc7ba59407
update deps and fix ci
philipp
2024-03-01 09:08:50 +01:00 -
966254807c
Merge pull request 'allow sending mails w/o attachments :-)' (#218) from staging into main
philipp
2024-03-01 08:41:12 +01:00 -
770e321bed
allow sending mails w/o attachments :-)
philipp
2024-03-01 08:40:02 +01:00 -
4f6dacb907
Merge pull request 'use old lock file to make ci work' (#216) from staging into main
philipp
2024-02-21 15:39:22 +01:00 -
f7a7ab8733
use old lock file to make ci work
philipp
2024-02-21 15:35:12 +01:00 -
4ddac52a93
Merge pull request 'increase timeout for frontend tests' (#215) from staging into main
philipp
2024-02-21 15:08:31 +01:00 -
65e425fed7
increase timeout for frontend tests
philipp
2024-02-21 15:06:35 +01:00 -
cdd57eb147
Merge pull request 'code cleanup' (#214) from staging into main
philipp
2024-02-21 14:47:54 +01:00 -
6ed28994c6
code cleanup
philipp
2024-02-21 14:46:17 +01:00 -
4a0026a9ee
Merge pull request 'staging' (#213) from staging into main
philipp
2024-02-21 13:58:29 +01:00 -
e9bee963fe
update deps
philipp
2024-02-21 13:58:03 +01:00 -
75d7396b96
push
philipp
2024-02-17 12:48:25 +01:00 -
9746a2114c
push
philipp
2024-02-17 12:47:06 +01:00 -
ce2e4e5219
Merge pull request 'dont expect money from deleted users :-)' (#212) from staging into main
philipp
2024-02-16 13:14:49 +01:00 -
6e0c594c84
dont expect money from deleted users :-)
philipp
2024-02-16 13:13:57 +01:00 -
b2fd52e4a5
Merge pull request 'also remove js function for (unnecessary) filtering of months' (#211) from staging into main
philipp
2024-02-16 10:48:05 +01:00 -
fe2ca0f33a
also remove js function for (unnecessary) filtering of months
philipp
2024-02-16 10:47:28 +01:00 -
14fbfd200b
Merge pull request 'remove useless button' (#210) from staging into main
philipp
2024-02-16 08:05:57 +01:00 -
043d042dcc
remove useless button
philipp
2024-02-16 08:05:07 +01:00 -
ebbd9215ea
Merge pull request 'staging' (#209) from staging into main
philipp
2024-02-15 22:30:02 +01:00 -
d0b7f9c76c
dont sent deleted users a mail
philipp
2024-02-15 22:29:08 +01:00 -
58b498b9de
use proper encoding
philipp
2024-02-15 22:21:40 +01:00 -
23f5e3ca4a
add functionality to send attachmets, Fixes #113
philipp
2024-02-15 21:52:00 +01:00 -
7ff9978587
switch to new ci image
philipp
2024-02-15 12:01:28 +01:00 -
f58d0d010e
Merge pull request 'upgrade major deps' (#208) from staging into main
philipp
2024-02-13 23:25:55 +01:00 -
da9d2febf1
upgrade major deps
philipp
2024-02-13 23:25:08 +01:00 -
86f2f3fb0c
Merge pull request 'update deps' (#207) from staging into main
philipp
2024-02-13 14:20:19 +01:00 -
23cfc8aa1f
update deps
philipp
2024-02-13 14:19:46 +01:00 -
d731f97169
Merge pull request 'only show donauLinz user in stats, otherwise count as guest' (#206) from staging into main
philipp
2024-02-12 20:10:03 +01:00 -
0231d2bd21
only show donauLinz user in stats, otherwise count as guest
philipp
2024-02-12 20:09:30 +01:00 -
808cdbaddc
Merge pull request 'add remark about bank synchornistaion' (#205) from staging into main
philipp
2024-02-12 19:08:28 +01:00 -
5b5eb2e831
add remark about bank synchornistaion
philipp
2024-02-12 19:07:45 +01:00 -
cef1d91ee3
Merge pull request 'better wording' (#203) from staging into main
philipp
2024-02-11 16:05:37 +01:00 -
8c43ab3331
better wording
philipp
2024-02-11 16:04:47 +01:00 -
08d935e6a5
Merge pull request 'update list of filtered log in attempts' (#201) from staging into main
philipp
2024-02-07 12:37:15 +01:00 -
9c8bb59ad7
update list of filtered log in attempts
philipp
2024-02-07 12:36:27 +01:00 -
49b810d200
Merge pull request 'staging' (#198) from staging into main
philipp
2024-02-06 16:42:55 +01:00 -
664bb62733
fix ci
philipp
2024-02-06 16:12:10 +01:00 -
c1bed58fbb
no sudo for deployment...
philipp
2024-02-06 16:03:11 +01:00 -
ccd9aad51f
switch deplyment
philipp
2024-02-06 16:01:34 +01:00 -
123efa1c8c
Merge pull request 'only send mails to proper addresses' (#197) from staging into main
philipp
2024-02-05 22:22:08 +01:00 -
19afa34c13
only send mails to proper addresses
philipp
2024-02-04 10:34:58 +01:00 -
ded9ed984b
Merge pull request 'increase whitelist of not logging certain (wp logins)' (#196) from staging into main
philipp
2024-01-31 10:24:14 +01:00 -
59f0ee1429
increase whitelist of not logging certain (wp logins)
philipp
2024-01-31 10:23:33 +01:00 -
5c61998ff7
Merge pull request 'update deps' (#195) from staging into main
philipp
2024-01-26 13:26:58 +01:00 -
6f94bb1186
update deps
philipp
2024-01-26 13:26:26 +01:00 -
9181b79166
Merge pull request 'update tests to new name field in update' (#194) from staging into main
philipp
2024-01-24 23:05:04 +01:00 -
1913bf8b22
update tests to new name field in update
philipp
2024-01-24 23:04:35 +01:00 -
24667e56a4
Merge pull request 'allow changing title of planned-event; fixes #52' (#193) from staging into main
philipp
2024-01-24 22:48:18 +01:00 -
3462ac5963
allow changing title of planned-event; fixes #52
philipp
2024-01-24 22:47:53 +01:00 -
29486ac7a2
Merge pull request 'supply all variables for planned_event roles' (#191) from staging into main
philipp
2024-01-24 18:18:51 +01:00 -
9ae5963a0a
supply all variables for planned_event roles
philipp
2024-01-24 18:18:26 +01:00 -
20e2be114a
Merge pull request 'fix edit/delete trip' (#190) from staging into main
philipp
2024-01-24 18:12:53 +01:00 -
99c615c400
fix edit/delete trip
philipp
2024-01-24 18:12:22 +01:00 -
4ecdc8968f
Merge pull request 'don't spam logs with (unsuccessful) wordpress login attempts' (#189) from staging into main
philipp
2024-01-24 13:10:02 +01:00 -
a6faa128ec
don't spam logs with (unsuccessful) wordpress login attempts
philipp
2024-01-24 13:09:12 +01:00 -
7f564100b1
Merge pull request 'add has-paid filter' (#181) from staging into main
philipp
2024-01-22 22:59:03 +01:00 -
6ad3b8f741
add has-paid filter
philipp
2024-01-22 22:57:42 +01:00 -
353b413d9f
Merge pull request 'update deps' (#180) from staging into main
philipp
2024-01-22 22:39:17 +01:00 -
083ddeadc1
update deps
philipp
2024-01-22 22:34:54 +01:00 -
2e3be062c6
Merge pull request 'staging' (#178) from staging into main
philipp
2024-01-22 22:24:24 +01:00 -
6d61d1f8bc
Merge branch 'main' into staging
philipp
2024-01-22 22:08:39 +01:00 -
b7499bd6cb
clean code; if logged out: save url where user tried to go to, go there once logged in, Fixes #179
philipp
2024-01-22 22:08:05 +01:00 -
60b9a4dbba
adapt unit tests to account for new redirect
philipp
2024-01-22 20:55:05 +01:00 -
a1a5e2ad89
move managing events to own role
philipp
2024-01-22 19:27:22 +01:00 -
eda072c713
enable changing paid state
philipp
2024-01-22 19:05:18 +01:00 -
4a06d519bf
Merge pull request 'staging' (#177) from staging into main
philipp
2024-01-21 16:10:32 +01:00 -
ac5ecbafec
Merge branch 'staging' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into staging
philipp
2024-01-21 16:09:53 +01:00 -
c54efdeec4
add spacing
philipp
2024-01-21 16:09:43 +01:00 -
491b2cac82
Merge pull request 'main' (#176) from main into staging
philipp
2024-01-21 16:08:47 +01:00 -
5f31c565a3
Merge pull request 'trim mails' (#175) from staging into main
philipp
2024-01-21 16:08:10 +01:00 -
6a22811ad9
trim mails
philipp
2024-01-21 16:07:11 +01:00 -
7c7163f541
Merge pull request 'staging' (#174) from staging into main
philipp
2024-01-21 16:01:22 +01:00 -
f4cb051b84
fix mail error
philipp
2024-01-21 16:00:41 +01:00 -
2032b7e0db
Merge pull request 'main' (#173) from main into staging
philipp
2024-01-19 11:58:41 +01:00 -
83c7b45139
Merge pull request 'staging' (#172) from staging into main
philipp
2024-01-19 11:58:05 +01:00 -
7f7259a3e1
improve texts
philipp
2024-01-19 11:56:49 +01:00 -
99e3aa22a2
fix errors
philipp
2024-01-19 11:47:28 +01:00 -
0ed740ec47
create fee reminder mail
philipp
2024-01-19 11:19:24 +01:00 -
578e3df9e9
use text instead of creditor id in qr code, more clear that fee is for full family
philipp
2024-01-19 10:22:13 +01:00 -
3a8650028d
add qr code for payment
philipp
2024-01-19 10:10:23 +01:00 -
c036cda593
Merge pull request 'remove wrong header' (#171) from staging into main
philipp
2024-01-19 08:48:29 +01:00 -
f1ba331fdf
remove wrong header
philipp
2024-01-19 08:47:49 +01:00 -
14a5952e14
Merge pull request 'group families in fee calc' (#170) from staging into main
philipp
2024-01-19 08:02:59 +01:00 -
e498b4be3b
group families in fee calc
philipp
2024-01-19 08:02:09 +01:00 -
ae8887c72d
Merge pull request 'staging' (#169) from staging into main
philipp
2024-01-19 07:43:05 +01:00 -
519cd1985d
Merge pull request 'final' (#168) from final into staging
philipp
2024-01-19 01:00:07 +01:00 -
3df6791b6b
fix ci
philipp
2024-01-19 00:50:30 +01:00 -
cb892e1c0c
remove unnecessary field
philipp
2024-01-19 00:46:51 +01:00 -
b893989dce
handle supporing fees
philipp
2024-01-19 00:44:53 +01:00 -
267becfbce
progress @fees, next step, deply+enter families/student/pupil/...
philipp
2024-01-19 00:39:15 +01:00