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

• 71ec5ce01a
  Merge branch 'staging' into 'main' PhilippHofer 2023-09-05 11:27:30 +0000
• caac2f06c1 Merge branch 'staging' into 'main' PhilippHofer 2023-09-05 11:27:22 +0000
• 689ff36534 don't be too funny philipp 2023-09-05 13:21:18 +0200
• c5f3c8d1f3 push philipp 2023-09-05 13:20:42 +0200
• d07581aa3d [TASK] replace Freitag with Markttag for phipsi Marie Birner 2023-04-10 22:56:47 +0200
• 73f3c2def3 push philipp 2023-09-05 13:17:33 +0200
• ace5cc4fdf fix ci philipp 2023-08-21 14:31:11 +0200
• 90c82b8327 fix ci philipp 2023-08-21 14:03:52 +0200
• e96b292ed8 rebase philipp 2023-08-21 13:18:38 +0200
• f36074926d don't send empty form fields philipp 2023-08-21 13:00:35 +0200
• af15d31482 [TASK] refactor ids in sidebar form Marie Birner 2023-08-05 15:32:13 +0200
• 11ff920161 [TASK] rm all inline js code and refactor select macro Marie Birner 2023-08-05 15:21:14 +0200
• 1d885a4fbf don't send empty form fields philipp 2023-08-21 13:00:35 +0200
• 2bef64ce24 Merge branch 'refactor-code' of gitlab.com:PhilippHofer/rot into refactor-code philipp 2023-08-10 01:07:03 +0200
• b3ed5a3c2b [TASK] refactor ids in sidebar form Marie Birner 2023-08-05 15:32:13 +0200
• 1238b59f57 [TASK] rm all inline js code and refactor select macro Marie Birner 2023-08-05 15:21:14 +0200
• 31435e9c3b rename labels philipp 2023-08-09 23:39:11 +0200
• 662f952807 Merge branch 'allow_to_add_real_guests' into 'staging' PhilippHofer 2023-08-09 20:30:37 +0000
• 590b41aa33 Allow to add real guests PhilippHofer 2023-08-09 20:30:37 +0000
• 87ae05a7ef Merge branch 'allow_to_add_real_guests' into 'staging' PhilippHofer 2023-08-09 20:29:56 +0000
• ff70bc3970 clean code philipp 2023-08-09 22:29:53 +0200
• 91043377f5 fix ci philipp 2023-08-09 22:12:13 +0200
• d0015a9483 allow to add real guests philipp 2023-08-09 21:55:19 +0200
• 723ada09b0 update deps philipp 2023-08-09 13:43:51 +0200
• 4acefb3749 fix typo philipp 2023-08-09 12:43:30 +0200
• 5deece48ea Merge branch 'staging' into 'main' PhilippHofer 2023-08-09 10:15:38 +0000
• 65594b45ba Merge branch 'staging' into 'main' PhilippHofer 2023-08-09 10:06:51 +0000
• 0afd523e05 update faq philipp 2023-08-09 12:01:49 +0200
• bd4ee5954c implement is_locked for trip_details philipp 2023-08-09 11:54:18 +0200
• f7930deaac Merge commit '21c5609b31ae6bc5a2a03f479876670f5eed8d86' into refactor-code Marie Birner 2023-08-05 17:25:32 +0200
• 21c5609b31 set test logbook data philipp 2023-08-05 16:58:20 +0200
• f0c6bdac14 fix ci; clean code philipp 2023-08-05 16:29:58 +0200
• 94a9d285be clean db philipp 2023-08-05 16:27:51 +0200
• 64aefde8bc fix stat query philipp 2023-08-05 15:58:17 +0200
• ab54440126 [TASK] refactor ids in sidebar form Marie Birner 2023-08-05 15:32:13 +0200
• 1931a9d24f [TASK] rm all inline js code and refactor select macro Marie Birner 2023-08-05 15:21:14 +0200
• 7309b1f2b2 update unit tests; add location name in kiosk settting to cookie (to avoid specific redirects) philipp 2023-08-05 13:21:35 +0200
• e459a4e2d9 store loation in kiosk cookie, to avoid having to handle each location separately philipp 2023-08-05 13:09:58 +0200
• 351ba1ba4e fix tests, default redirect to linz kiosk philipp 2023-08-05 13:01:01 +0200
• 23844243b8 Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging philipp 2023-08-05 12:59:23 +0200
• 8a40dfe017 allow filter for kiosk, to only show boats at specific location philipp 2023-08-05 12:59:02 +0200
• d556e67cee Merge branch 'staging' into 'main' PhilippHofer 2023-08-05 10:51:56 +0000
• 9780481799 Merge branch 'staging' into 'main' PhilippHofer 2023-08-05 10:39:41 +0000
• 2192bb73ed Merge branch 'fix-order-trips' into 'staging' PhilippHofer 2023-08-05 10:38:58 +0000
• f3416771ee Merge branch 'fix-order-trips' into 'staging' PhilippHofer 2023-08-05 10:38:45 +0000
• 6809a85749 add option to lock boat on damage philipp 2023-08-05 12:05:54 +0200
• f3c18c6949 update mail address philipp 2023-08-02 18:36:38 +0200
• 8eb8597293 allow optional different table in staging philipp 2023-08-02 15:02:03 +0200
• ff31ad83fe add boatdamages functionality philipp 2023-08-02 14:29:19 +0200
• f7e623b8c3 strip binary philipp 2023-08-01 14:53:06 +0200
• f2baca668c add tests for tera/admin/planned_event philipp 2023-07-31 21:33:49 +0200
• da6a16cd66 add tests for tera/admin/planned_event philipp 2023-07-31 21:29:03 +0200
• 8fa8e17c5a add tests for tera/admin/planned_event philipp 2023-07-31 21:15:28 +0200
• 96af3c3b17 create tests for /public philipp 2023-07-31 21:07:01 +0200
• 91ffcbb720 Merge branch 'fix-order-trips' of gitlab.com:PhilippHofer/rot into fix-order-trips philipp 2023-07-31 20:12:56 +0200
• 5b8dfb8284 fix order of displayed trips + events philipp 2023-07-31 08:18:37 +0200
• 3730940aed add tests for tera/log.rs philipp 2023-07-31 20:09:03 +0200
• 8b5be3fb41 add test for tera/admin/boat.rs philipp 2023-07-31 19:38:53 +0200
• 47b534f8c3 create tests for model/logbook philipp 2023-07-31 19:10:34 +0200
• adb26f6b91 create tests for model/rower.rs, Closes #32 philipp 2023-07-31 16:59:15 +0200
• 32e6148844 use query_as instead of manual mapping philipp 2023-07-31 16:33:44 +0200
• dc4b4b3499 add tests; Closes #30 philipp 2023-07-31 16:25:07 +0200
• bbb78cbc44 move todos to gitlab; write tests for /cox/remove/<id>; Closes #9 philipp 2023-07-31 13:34:02 +0200
• c4100e6c68 backup working systemd service files philipp 2023-07-31 12:46:14 +0200
• a40001f0ad Merge branch 'update-deps' into 'staging' PhilippHofer 2023-07-31 07:33:27 +0000
• ad80ac3850 Merge branch 'update-deps' into 'staging' PhilippHofer 2023-07-31 07:27:00 +0000
• e6800edf68 Merge branch 'staging' into 'main' PhilippHofer 2023-07-31 07:25:34 +0000
• 051afa77b3 Merge branch 'staging' into 'main' PhilippHofer 2023-07-31 07:25:25 +0000
• 8fa81a6f8e update deps philipp 2023-07-31 09:22:41 +0200
• a79e22e19f add ideas philipp 2023-07-31 09:19:28 +0200
• b2e84d727c use local timestamp for log philipp 2023-07-31 09:10:26 +0200
• fa75cf3169 add ideas philipp 2023-07-31 08:24:28 +0200
• 103e770fa6 fix order of displayed trips + events philipp 2023-07-31 08:18:37 +0200
• 700ab8110b Merge branch 'remove-static-folder' into 'staging' PhilippHofer 2023-07-31 05:53:25 +0000
• 46cbdf1772 Merge branch 'remove-static-folder' into 'staging' PhilippHofer 2023-07-31 05:53:20 +0000
• 727d8d52dd remove static folder philipp 2023-07-31 07:52:57 +0200
• b5962dcb84 Merge branch 'staging' into 'main' PhilippHofer 2023-07-31 05:51:51 +0000
• e401d81601 Merge branch 'staging' into 'main' PhilippHofer 2023-07-31 05:51:34 +0000
• 332b505955 Merge branch 'verify-rower-on-water' into 'staging' PhilippHofer 2023-07-30 21:11:51 +0000
• 75d5f938e7 Merge branch 'verify-rower-on-water' into 'staging' PhilippHofer 2023-07-30 20:59:59 +0000
• 1bff814811 push philipp 2023-07-30 22:59:47 +0200
• 9d0bae34b9 Merge branch 'js' into 'staging' Marie Birner 2023-07-30 20:36:01 +0000
• b1a42b2683 Merge branch 'js' into 'staging' Marie Birner 2023-07-30 20:35:58 +0000
• 5e571b935e Merge branch 'fix-ci' into 'staging' PhilippHofer 2023-07-30 20:35:56 +0000
• 7e5d267f75 Merge branch 'fix-ci' into 'staging' PhilippHofer 2023-07-30 20:35:53 +0000
• 57d7b35912 fix ci philipp 2023-07-30 22:35:17 +0200
• 0c0d1ffb00 [TASK] show pretty timestamp Marie Birner 2023-07-30 22:35:16 +0200
• 4fe17284bb Merge branch 'fix-error-diff-sqlite-version' into 'staging' PhilippHofer 2023-07-30 20:18:11 +0000
• 8420280e6d Merge branch 'fix-error-diff-sqlite-version' into 'staging' PhilippHofer 2023-07-30 20:18:06 +0000
• 7e09c81d5e fix error on diff sqlite version philipp 2023-07-30 22:17:47 +0200
• 9e413978eb Merge branch 'fix-error-diff-sqlite-version' into 'staging' PhilippHofer 2023-07-30 19:54:54 +0000
• 6467e2dd4a Merge branch 'fix-error-diff-sqlite-version' into 'staging' PhilippHofer 2023-07-30 19:44:09 +0000
• e3105ca8d7 Merge branch 'styling' into 'staging' PhilippHofer 2023-07-30 19:18:11 +0000
• f8df0edbb5 Merge branch 'styling' into 'staging' PhilippHofer 2023-07-30 19:18:07 +0000
• 38c53a26f9 Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging philipp 2023-07-30 21:17:12 +0200
• a3ca996f78 push philipp 2023-07-30 19:56:53 +0200
• cf897df36f push philipp 2023-07-30 19:37:08 +0200
• 6029d7b9b6 use new nodejs philipp 2023-07-30 19:35:10 +0200
• d1dd5372bd push philipp 2023-07-30 19:20:04 +0200
• 2beff31a71 push philipp 2023-07-30 18:30:56 +0200