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

Mono Color

• 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
• 0cbfadbe1c Merge pull request 'Update staging-diff.sql' (#65) from log-2022 into staging philipp 2023-11-20 08:23:25 +01:00
• ecd4e87f98 Update staging-diff.sql philipp 2023-11-20 08:22:48 +01:00
• 817a167223 Merge pull request 'log-2022' (#63) from log-2022 into staging philipp 2023-11-19 22:21:46 +01:00
• f004a34b54 Merge branch 'staging' into log-2022 philipp 2023-11-19 22:20:53 +01:00
• 4199fadc0a use current year in test_db philipp 2023-11-19 22:19:28 +01:00
• 7bc8293c65 add routes for different years philipp 2023-11-18 12:21:37 +01:00
• 1d9824dfdc push philipp 2023-11-19 22:01:14 +01:00
• 08202691f6 push philipp 2023-11-19 21:41:46 +01:00