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

• d1edec2833 fix db philipp 2023-11-09 08:58:09 +01:00
• 715fae59fc implement default destination for boats philipp 2023-11-09 08:56:08 +01:00
• 00f74ffb10 Merge branch 'staging' into 'main' PhilippHofer 2023-11-09 06:46:41 +00:00
• ed0989e2a1 Merge branch 'dark-mode' into 'staging' PhilippHofer 2023-11-09 06:31:30 +00:00
• 6fbda666d5 Merge branch 'staging' into 'main' PhilippHofer 2023-11-09 06:30:49 +00:00
• f1661f9eab Merge branch 'new-rocket' into 'main' PhilippHofer 2023-11-09 06:25:50 +00:00
• 8f45724848 Merge branch 'input-val' into 'main' PhilippHofer 2023-11-09 06:25:37 +00:00
• 63c7a27131 Merge branch 'ergo-admin-edit' into 'main' PhilippHofer 2023-11-09 05:53:18 +00:00
• 1dd30f9c75 Merge branch 'brighter-black' into 'dark-mode' PhilippHofer 2023-11-09 05:52:36 +00:00
• ae0a1121d4 Merge branch 'input-val' into 'staging' PhilippHofer 2023-11-08 17:16:02 +00:00
• ae7391e239 Merge branch 'new-rocket' into 'staging' PhilippHofer 2023-11-08 17:03:25 +00:00
• 04958d80a4 Merge branch 'staging' into 'input-val' PhilippHofer 2023-11-08 17:02:32 +00:00
• e7a6d57bf0 simple (client only) val philipp 2023-11-08 18:00:27 +01:00
• 144bcefcab update deps, switch to newest rocket version philipp 2023-11-08 17:39:39 +01:00
• 6db40f4d79 Merge branch 'ergo-admin-edit' into 'staging' PhilippHofer 2023-11-07 21:15:04 +00:00
• 61cc470e0f also allow dozen updates philipp 2023-11-07 22:01:34 +01:00
• 3c20a3dc6a Merge branch 'ergo-admin-edit' into 'staging' PhilippHofer 2023-11-07 20:41:17 +00:00
• 4f4c053d0e ergo-admin-edit philipp 2023-11-07 21:27:40 +01:00
• c0cefd82b6 slightly change labels philipp 2023-11-07 20:53:45 +01:00
• 7c684a30f7 update deps; allow gallery image select philipp 2023-11-07 20:49:22 +01:00
• 7bd07b911a use a slightly brighter black philipp 2023-11-07 15:31:06 +01:00
• 48f26a1379 Merge branch 'dark-mode' into staging Marie Birner 2023-11-04 20:53:29 +01:00
• 8123299861 [BUGFIX] login screen dark mode Marie Birner 2023-11-04 20:51:03 +01:00
• e3ba0a033a Merge branch 'dark-mode' into staging Marie Birner 2023-11-04 20:17:49 +01:00
• 895492946c [TASK] add color switch option btn Marie Birner 2023-11-04 20:16:20 +01:00
• b465923fa9 [TASK] support dark mode second draft Marie Birner 2023-11-04 19:45:57 +01:00
• 97897437a9 [TASK] support dark mode second draft Marie Birner 2023-11-04 19:33:36 +01:00
• 2fd053efed Merge commit 'bc9c5198d1a1df7526ee95de9411f8e7d0a60894' into dark-mode Marie Birner 2023-11-04 17:25:14 +01:00
• bc9c5198d1 Merge branch 'fix-rower-select-error' into 'main' Marie Birner 2023-11-04 16:19:54 +00:00
• 020ecfb154 Merge branch 'fix-rower-select-error' into 'staging' PhilippHofer 2023-11-04 15:40:47 +00:00
• 0f8c7a365e push philipp 2023-11-04 16:27:17 +01:00
• 9de2a615a6 Merge branch 'show-proper-amount-guests' into 'staging' PhilippHofer 2023-11-04 14:39:43 +00:00
• c2034ed690 show proper amount of guests (changed bc cox is now included in rowers) philipp 2023-11-04 15:07:16 +01:00
• 5f494dc9e9 [TASK] support dark mode first draft Marie Birner 2023-11-04 00:19:46 +01:00
• 555882b4c7 Merge branch 'ergo-styling' into 'staging' PhilippHofer 2023-11-03 13:48:16 +00:00
• c4e3c836e2 [TASK] guest user menu ergo Marie Birner 2023-11-03 14:35:15 +01:00
• 150a86c2f1 Merge commit '95e1ea302884fa1214950b6c4005525f7469ac58' into ergo-styling Marie Birner 2023-11-03 14:31:14 +01:00
• 8014dba27e [TASK] guest user menu ergo Marie Birner 2023-11-03 14:30:43 +01:00
• 95e1ea3028 allow guests to see + upload ergo entries; show ergo menu item for guests philipp 2023-11-03 14:20:58 +01:00
• 5ac3ae348c Merge branch 'ergo-styling' into 'main' PhilippHofer 2023-11-03 11:21:00 +00:00
• a1d7bd8269 Merge branch 'ergo-styling' into 'staging' Marie Birner 2023-11-03 10:05:52 +00:00
• 1522531baa [TASK] styling ergo challenge screen Marie Birner 2023-11-03 10:52:30 +01:00
• 7bdaceaafe Merge branch 'auto-select-owner' into 'main' Marie Birner 2023-11-03 07:11:15 +00:00
• 9331b2001d improve code with clippy philipp 2023-11-02 22:19:13 +01:00
• 1b58641100 Merge branch 'auto-select-owner' into 'staging' PhilippHofer 2023-11-02 19:04:23 +00:00
• f5ad37a0bb auto select owner as rower of private boat, Fixes #46 philipp 2023-11-02 19:50:19 +01:00
• 650e96cccd Merge branch 'staging' into 'main' PhilippHofer 2023-11-02 18:47:34 +00:00
• d9322c9702 Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging philipp 2023-11-02 19:32:24 +01:00
• eb0f3ba9d8 clearer label philipp 2023-11-02 19:32:16 +01:00
• a9ded48feb Merge branch 'minor' into 'staging' PhilippHofer 2023-11-02 18:16:17 +00:00
• 0bbedfc9cc remove staging diff as it's deployed philipp 2023-11-02 19:11:23 +01:00
• 77faf30475 push philipp 2023-11-02 19:03:01 +01:00
• 71da6546b0 image required; cleaner log philipp 2023-11-02 18:59:33 +01:00
• a9ca715d6d push philipp 2023-11-02 19:01:13 +01:00
• 27e40783e1 image required; cleaner log philipp 2023-11-02 18:59:33 +01:00
• c11b73b7e6 remove db migration as ergo changes are in prod. philipp 2023-11-02 18:33:30 +01:00
• cd611cf251 Merge branch 'ergo' into 'main' PhilippHofer 2023-11-02 17:26:45 +00:00
• eddcdf292f Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 15:01:09 +00:00
• 039f9fbddf switch order philipp 2023-11-02 16:00:41 +01:00
• 4afed60f29 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 14:48:23 +00:00
• 2767e2fe25 better label philipp 2023-11-02 15:34:21 +01:00
• 6c3fd89b00 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 14:17:51 +00:00
• 4726c25d20 migration + better ordering philipp 2023-11-02 15:04:08 +01:00
• d5c88ef956 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 13:54:23 +00:00
• 8cb9bb36c7 fix limits philipp 2023-11-02 14:40:26 +01:00
• bf24c8aa9c Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 13:04:12 +00:00
• 50de29284f disable reload on ergo page; allow camera capture philipp 2023-11-02 13:50:34 +01:00
• f7b24b4d50 Merge branch 'ergo' of gitlab.com:PhilippHofer/rot into ergo philipp 2023-11-02 13:19:38 +01:00
• 2bff02f43a ergo: default own person philipp 2023-11-02 13:19:21 +01:00
• 728d87ab05 show own data + add gitignore folder philipp 2023-11-02 12:58:50 +01:00
• 41bdc73cfa fix deplox ci g philipp 2023-11-02 13:02:44 +01:00
• cf2d599e16 fix deploy philipp 2023-11-02 13:01:19 +01:00
• 25eabefd43 show own data + add gitignore folder philipp 2023-11-02 12:58:50 +01:00
• 07c9ac8a31 Merge branch 'ergo' into 'staging' PhilippHofer 2023-11-02 11:45:07 +00:00
• e1a7bdae65 fix ci philipp 2023-11-02 12:25:13 +01:00
• dc3e5555df push philipp 2023-11-02 12:15:54 +01:00
• 1ff050a247 add ergo tool philipp 2023-11-02 12:15:10 +01:00
• 2eba6a0f66 more rights to the kiosk! philipp 2023-10-31 22:41:12 +01:00
• 7a622a5615 Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging philipp 2023-10-31 22:16:51 +01:00
• 56ae0ae429 fix 1x no cox stuff philipp 2023-10-31 22:16:14 +01:00
• d805f6c1cd [BUGFIX] stat wording and search string Marie Birner 2023-10-31 21:57:31 +01:00
• 4179b7bd6b [TASK] declutter end trip view Marie Birner 2023-10-31 21:43:25 +01:00
• 2bd5d76c2f Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging Marie Birner 2023-10-31 21:12:23 +01:00
• ea1041aa73 fix node ci philipp 2023-10-31 21:08:57 +01:00
• 8a3cd8d688 [BUGFIX] relationship destination and distance Marie Birner 2023-10-31 21:04:38 +01:00
• 2d7c86f323 aaaaah philipp 2023-10-31 21:02:56 +01:00
• dc4eddc044 Merge commit 'ef0965fad12c402e14fad64f3ece50fca3cb9638' into staging Marie Birner 2023-10-31 20:58:38 +01:00
• 3c7f56e94f [TASK] beautify Steuerperson/Schiffsführer tag in list view Marie Birner 2023-10-31 20:57:28 +01:00
• d9c7c218bc allow no cox in 1x; require them in >2x philipp 2023-10-31 20:57:05 +01:00
• e428d01ea8 Merge branch 'boat-stats' into 'main' Marie Birner 2023-10-31 19:42:42 +00:00
• ef0965fad1 Merge branch 'boat-stats' into 'staging' PhilippHofer 2023-10-31 19:42:42 +00:00
• aed8e7d5c3 use names that also m enjoys seeing philipp 2023-10-31 20:29:33 +01:00
• 8479d0c70b fix link philipp 2023-10-31 20:25:12 +01:00
• abe4a68c23 Merge branch 'boat-stats' into 'staging' PhilippHofer 2023-10-31 17:35:54 +00:00
• fe5ba9020d also show in kiosk mode philipp 2023-10-31 18:22:34 +01:00
• a6519d7b7b Merge branch 'boat-stats' into 'staging' PhilippHofer 2023-10-31 15:20:36 +00:00
• 730f9e5dff add boat stats Fixes #50 philipp 2023-10-31 16:07:15 +01:00
• 10529234da Merge branch 'new-db' into 'staging' PhilippHofer 2023-10-30 18:27:06 +00:00
• 07baf55612 fix npm build error philipp 2023-10-30 19:13:34 +01:00
• 74dabae390 clean up + make maxitemcount in sidebar work philipp 2023-10-30 19:08:19 +01:00