Commit Graph

Select branches

Hide Pull Requests

main

staging

#101

#102

#103

#104

#106

#107

#108

#109

#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

#82

#83

#85

#87

#88

#89

#90

#91

#92

#93

#94

#95

#97

#98

#99

test

Mono Color

• 8014dba27e [TASK] guest user menu ergo Marie Birner 2023-11-03 14:30:43 +0100
• d3e6ec36c7 Merge branch 'ergo-guest' into 'staging' PhilippHofer 2023-11-03 13:23:31 +0000
• 95e1ea3028 allow guests to see + upload ergo entries; show ergo menu item for guests philipp 2023-11-03 14:20:58 +0100
• 5ac3ae348c Merge branch 'ergo-styling' into 'main' PhilippHofer 2023-11-03 11:21:00 +0000
• a1d7bd8269 Merge branch 'ergo-styling' into 'staging' Marie Birner 2023-11-03 10:05:52 +0000
• e48595f4d8 Merge branch 'ergo-styling' into 'main' Marie Birner 2023-11-03 09:54:26 +0000
• 05a3fc3efd Merge branch 'ergo-styling' into 'staging' Marie Birner 2023-11-03 09:53:10 +0000
• 1522531baa [TASK] styling ergo challenge screen Marie Birner 2023-11-03 10:52:30 +0100
• 7bdaceaafe Merge branch 'auto-select-owner' into 'main' Marie Birner 2023-11-03 07:11:15 +0000
• 9331b2001d improve code with clippy philipp 2023-11-02 22:19:13 +0100
• 1b58641100 Merge branch 'auto-select-owner' into 'staging' PhilippHofer 2023-11-02 19:04:23 +0000
• fc6a81b216 Merge branch 'auto-select-owner' into 'main' PhilippHofer 2023-11-02 18:51:29 +0000
• 87012d5394 Merge branch 'auto-select-owner' into 'staging' PhilippHofer 2023-11-02 18:50:55 +0000
• f5ad37a0bb auto select owner as rower of private boat, Fixes #46 philipp 2023-11-02 19:50:19 +0100
• 650e96cccd Merge branch 'staging' into 'main' PhilippHofer 2023-11-02 18:47:34 +0000
• 737a9f47b3 Merge branch 'staging' into 'main' PhilippHofer 2023-11-02 18:33:28 +0000
• d9322c9702 Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging philipp 2023-11-02 19:32:24 +0100
• eb0f3ba9d8 clearer label philipp 2023-11-02 19:32:16 +0100
• a9ded48feb Merge branch 'minor' into 'staging' PhilippHofer 2023-11-02 18:16:17 +0000
• 4f8fc06d4f Merge branch 'minor' into 'staging' PhilippHofer 2023-11-02 18:16:15 +0000
• 0bbedfc9cc remove staging diff as it's deployed philipp 2023-11-02 19:11:23 +0100
• 16bea1bf60 Merge branch 'minor' into 'main' PhilippHofer 2023-11-02 18:04:33 +0000
• 77faf30475 push philipp 2023-11-02 19:03:01 +0100
• 71da6546b0 image required; cleaner log philipp 2023-11-02 18:59:33 +0100
• a9ca715d6d push philipp 2023-11-02 19:01:13 +0100
• 27e40783e1 image required; cleaner log philipp 2023-11-02 18:59:33 +0100
• c11b73b7e6 remove db migration as ergo changes are in prod. philipp 2023-11-02 18:33:30 +0100
• cd611cf251 Merge branch 'ergo' into 'main' PhilippHofer 2023-11-02 17:26:45 +0000
• f0c8526c0e Merge branch 'ergo' into 'main' PhilippHofer 2023-11-02 15:01:23 +0000
• eddcdf292f Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 15:01:09 +0000
• be758b6355 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 15:01:02 +0000
• 039f9fbddf switch order philipp 2023-11-02 16:00:41 +0100
• 4afed60f29 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 14:48:23 +0000
• d3757d4095 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 14:34:55 +0000
• 2767e2fe25 better label philipp 2023-11-02 15:34:21 +0100
• 6c3fd89b00 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 14:17:51 +0000
• 831fd9308c Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 14:04:53 +0000
• 4726c25d20 migration + better ordering philipp 2023-11-02 15:04:08 +0100
• d5c88ef956 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 13:54:23 +0000
• 6a62ca1a01 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 13:41:15 +0000
• 8cb9bb36c7 fix limits philipp 2023-11-02 14:40:26 +0100
• bf24c8aa9c Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 13:04:12 +0000
• f7f3305566 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 12:51:00 +0000
• 50de29284f disable reload on ergo page; allow camera capture philipp 2023-11-02 13:50:34 +0100
• f7b24b4d50 Merge branch 'ergo' of gitlab.com:PhilippHofer/rot into ergo philipp 2023-11-02 13:19:38 +0100
• 2bff02f43a ergo: default own person philipp 2023-11-02 13:19:21 +0100
• 728d87ab05 show own data + add gitignore folder philipp 2023-11-02 12:58:50 +0100
• 41bdc73cfa fix deplox ci g philipp 2023-11-02 13:02:44 +0100
• cf2d599e16 fix deploy philipp 2023-11-02 13:01:19 +0100
• 25eabefd43 show own data + add gitignore folder philipp 2023-11-02 12:58:50 +0100
• 07c9ac8a31 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 11:45:07 +0000
• 6fe95dc1b3 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 11:25:54 +0000
• e1a7bdae65 fix ci philipp 2023-11-02 12:25:13 +0100
• dc3e5555df push philipp 2023-11-02 12:15:54 +0100
• 1ff050a247 add ergo tool philipp 2023-11-02 12:15:10 +0100
• 2eba6a0f66 more rights to the kiosk! philipp 2023-10-31 22:41:12 +0100
• 7a622a5615 Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging philipp 2023-10-31 22:16:51 +0100
• 56ae0ae429 fix 1x no cox stuff philipp 2023-10-31 22:16:14 +0100
• d805f6c1cd [BUGFIX] stat wording and search string Marie Birner 2023-10-31 21:57:31 +0100
• 4179b7bd6b [TASK] declutter end trip view Marie Birner 2023-10-31 21:43:25 +0100
• 2bd5d76c2f Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging Marie Birner 2023-10-31 21:12:23 +0100
• ea1041aa73 fix node ci philipp 2023-10-31 21:08:57 +0100
• 8a3cd8d688 [BUGFIX] relationship destination and distance Marie Birner 2023-10-31 21:04:38 +0100
• 2d7c86f323 aaaaah philipp 2023-10-31 21:02:56 +0100
• dc4eddc044 Merge commit 'ef0965fad12c402e14fad64f3ece50fca3cb9638' into staging Marie Birner 2023-10-31 20:58:38 +0100
• 3c7f56e94f [TASK] beautify Steuerperson/Schiffsführer tag in list view Marie Birner 2023-10-31 20:57:28 +0100
• d9c7c218bc allow no cox in 1x; require them in >2x philipp 2023-10-31 20:57:05 +0100
• e428d01ea8 Merge branch 'boat-stats' into 'main' Marie Birner 2023-10-31 19:42:42 +0000
• ef0965fad1 Merge branch 'boat-stats' into 'staging' PhilippHofer 2023-10-31 19:42:42 +0000
• 2f05f34991 Merge branch 'boat-stats' into 'staging' PhilippHofer 2023-10-31 19:30:47 +0000
• 1a6c67add7 Merge branch 'boat-stats' into 'main' PhilippHofer 2023-10-31 19:30:39 +0000
• aed8e7d5c3 use names that also m enjoys seeing philipp 2023-10-31 20:29:33 +0100
• 8479d0c70b fix link philipp 2023-10-31 20:25:12 +0100
• abe4a68c23 Merge branch 'boat-stats' into 'staging' PhilippHofer 2023-10-31 17:35:54 +0000
• fab89e6cfc Merge branch 'boat-stats' into 'staging' PhilippHofer 2023-10-31 17:23:02 +0000
• fe5ba9020d also show in kiosk mode philipp 2023-10-31 18:22:34 +0100
• a6519d7b7b Merge branch 'boat-stats' into 'staging' PhilippHofer 2023-10-31 15:20:36 +0000
• cf91481fea Merge branch 'boat-stats' into 'staging' PhilippHofer 2023-10-31 15:07:48 +0000
• 730f9e5dff add boat stats Fixes #50 philipp 2023-10-31 16:07:15 +0100
• 10529234da Merge branch 'new-db' into 'staging' PhilippHofer 2023-10-30 18:27:06 +0000
• d8e601a683 Merge branch 'new-db' into 'staging' PhilippHofer 2023-10-30 18:14:02 +0000
• 07baf55612 fix npm build error philipp 2023-10-30 19:13:34 +0100
• 74dabae390 clean up + make maxitemcount in sidebar work philipp 2023-10-30 19:08:19 +0100
• 107f84734a Merge branch 'new-db' into 'staging' PhilippHofer 2023-10-30 16:34:52 +0000
• e58444cf55 Merge branch 'new-db' into 'staging' PhilippHofer 2023-10-30 16:34:38 +0000
• 40f1d436fc migrate to new schema philipp 2023-10-30 16:26:36 +0100
• 143da65609 Merge branch 'new-db' into 'staging' PhilippHofer 2023-10-30 14:50:23 +0000
• bc73fd2321 Merge branch 'new-db' into 'staging' PhilippHofer 2023-10-30 14:44:53 +0000
• 376204b927 Merge branch 'quickfixes' into 'main' PhilippHofer 2023-10-30 14:39:05 +0000
• d297893086 fix ci philipp 2023-10-30 15:37:01 +0100
• d6043384a5 Merge branch 'new-db' of gitlab.com:PhilippHofer/rot into new-db philipp 2023-10-30 15:32:30 +0100
• 6e6b6eafa3 fix stat query philipp 2023-10-30 15:31:12 +0100
• 388ed175bd finish frontend(?) philipp 2023-10-30 15:19:43 +0100
• 7788be5a17 use proper names for new form fields philipp 2023-10-30 13:49:49 +0100
• 2d520298e7 frontend for new db philipp 2023-10-30 13:39:58 +0100
• e256d7274d use proper names for new form fields philipp 2023-10-30 09:31:22 +0100
• 010a8a870b allow proper amount of rowers philipp 2023-10-30 09:23:50 +0100
• ccc9f76691 do proper things in ui @ new log philipp 2023-10-30 09:21:35 +0100
• 1d7f95e522 finish backend tests of new db layout philipp 2023-10-29 20:41:30 +0100
• 09075989e3 first draft philipp 2023-10-29 18:42:12 +0100