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

• f354e77661 [BUGFIX] date seconds Marie Birner 2023-09-28 12:29:44 +02:00
• 0c37d0253c [TASK] improve white space entries logbook Marie Birner 2023-09-28 12:24:14 +02:00
• 82edb23f30 [BUGFIX] km issue relation destination Marie Birner 2023-09-28 12:21:35 +02:00
• 617b747942 [TASK] improve log and stats look & feel Marie Birner 2023-09-28 11:52:14 +02:00
• 3923ba9f8b [TASK] add current place to stats Marie Birner 2023-09-28 09:26:30 +02:00
• d139bf9a60 [BUGFIX] wordings Marie Birner 2023-09-27 15:55:17 +02:00
• a77e6b93c2 [TASK] basic styling logbook and stats Marie Birner 2023-09-27 15:36:07 +02:00
• 0e143381cf [TASK] streamline form Marie Birner 2023-09-27 14:46:34 +02:00
• b6a91f1017 [TASK] add basic reload functionality Marie Birner 2023-09-27 13:58:22 +02:00
• 74c0db4e75 [BUGFIX] js errors Marie Birner 2023-09-27 13:52:15 +02:00
• 670351397e [BUGFIX] header menu logbook styling Marie Birner 2023-09-27 13:47:43 +02:00
• 893f768c7d update deps philipp 2023-09-25 16:21:08 +02:00
• 6a1e01c2d9 fix ci philipp 2023-09-24 22:29:44 +02:00
• fea45d5257 fix multi-select; only show private boats owner + kiosk philipp 2023-09-24 22:17:28 +02:00
• a2c91b784a Merge branch 'select-dataset-issue' into 'staging' PhilippHofer 2023-09-24 09:44:44 +00:00
• c48fd1d87d fix ci philipp 2023-09-24 11:32:01 +02:00
• 93a6b81803 change select properly if boat is selected on the left philipp 2023-09-24 11:19:10 +02:00
• 1ea46760af [BUGFIX] reset rowers Marie Birner 2023-09-24 10:50:25 +02:00
• f3b0c74bbc [BUGFIX] issues with option create Marie Birner 2023-09-24 10:47:18 +02:00
• 72f172e4a2 [ISSUE] choices.js dataset lost Marie Birner 2023-09-24 10:32:38 +02:00
• 3c040fc979 allow users to delete trips philipp 2023-09-24 09:55:51 +02:00
• 0558b0458c verify that arrivaldate > departuredate philipp 2023-09-24 09:48:01 +02:00
• 03880af865 error if same person selected as cox + rower philipp 2023-09-24 09:12:27 +02:00
• 82a53cf1fc [TASK] fix alert issues styling Marie Birner 2023-09-23 23:44:03 +02:00
• f392e83af3 [TASK] select boat on click Marie Birner 2023-09-23 23:23:42 +02:00
• a186b96c67 [TASK] change styling choice.js Marie Birner 2023-09-23 22:58:15 +02:00
• 03f31a89b6 Merge commit '36d84e8157bb54c3cc215ca588a46e3d3a4cf0df' into staging Marie Birner 2023-09-23 22:31:32 +02:00
• eb1b3f412f [TASK] fix issues with destination Marie Birner 2023-09-23 22:31:19 +02:00
• 36d84e8157 disable rowers in logbook if they are on water philipp 2023-09-23 22:13:48 +02:00
• 33cb5e025b [TASK] improve rower select Marie Birner 2023-09-23 21:51:00 +02:00
• c0366edbe1 [TASK] add working choices.js Marie Birner 2023-09-23 21:05:08 +02:00
• 2abd483a3f [TASK] [NPM] install choices.js (styling copy & paste) Marie Birner 2023-09-23 19:19:28 +02:00
• 5730d27149 fix ci philipp 2023-09-23 18:26:04 +02:00
• c6a8866207 add debug trait; switch to proper name of form field (rowerS) philipp 2023-09-23 18:12:48 +02:00
• 9bb2996a4d make admin cox by default philipp 2023-09-23 17:40:17 +02:00
• 528477e728 update deps philipp 2023-09-22 08:00:08 +02:00
• 6e1bc101bf clean code with clippy philipp 2023-09-06 14:39:36 +02:00
• ba3a552def Merge branch 'staging' into 'main' PhilippHofer 2023-09-05 21:03:18 +00:00
• fe4c0bebfc Staging PhilippHofer 2023-09-05 21:03:18 +00:00
• 16da28561e Merge branch 'refactor-code' into 'staging' PhilippHofer 2023-09-05 20:48:02 +00:00
• a1dc92defd Refactor code PhilippHofer 2023-09-05 20:48:02 +00:00
• cbfc6be0e9 Merge branch 'staging' into 'main' PhilippHofer 2023-09-05 20:32:20 +00:00
• 709411ce5c remove deprecated function philipp 2023-09-05 16:13:36 +02:00
• bebe89d21b Merge branch 'upgrade-deps' into 'staging' PhilippHofer 2023-09-05 14:01:27 +00:00
• f846d78b6c Merge branch 'funny-replace' into 'staging' PhilippHofer 2023-09-05 13:59:33 +00:00
• 608adc9779 Merge branch 'upgrade-deps' of gitlab.com:PhilippHofer/rot into upgrade-deps philipp 2023-09-05 15:47:43 +02:00
• 7dc1964de3 update deps philipp 2023-09-05 13:28:30 +02:00
• dae59e4246 Merge branch 'funny-replace' of gitlab.com:PhilippHofer/rot into funny-replace philipp 2023-09-05 15:46:41 +02:00
• 16ca1a3482 don't be too funny philipp 2023-09-05 13:21:18 +02:00
• 36d86b079b [TASK] replace Freitag with Markttag for phipsi Marie Birner 2023-04-10 22:56:47 +02:00
• 4ef88ba6c5 don't be too funny philipp 2023-09-05 13:21:18 +02:00
• c06173d04b [TASK] replace Freitag with Markttag for phipsi Marie Birner 2023-04-10 22:56:47 +02:00
• e6daa99974 fix order ci philipp 2023-09-05 13:54:03 +02:00
• 22fbc715ec Merge branch 'funny-replace' of gitlab.com:PhilippHofer/rot into funny-replace philipp 2023-09-05 13:44:37 +02:00
• ac728dc203 don't be too funny philipp 2023-09-05 13:21:18 +02:00
• df26112820 [TASK] replace Freitag with Markttag for phipsi Marie Birner 2023-04-10 22:56:47 +02:00
• 21eef385d8 Merge branch 'upgrade-deps' of gitlab.com:PhilippHofer/rot into upgrade-deps philipp 2023-09-05 13:43:47 +02:00
• 6e68e71369 update deps philipp 2023-09-05 13:28:30 +02:00
• c23d22d027 install npm philipp 2023-09-05 13:41:11 +02:00
• 39a9347bab use new nodejs philipp 2023-09-05 13:38:53 +02:00
• 6bdb2610bd update deps philipp 2023-09-05 13:28:30 +02:00
• 71ec5ce01a Merge branch 'staging' into 'main' PhilippHofer 2023-09-05 11:27:30 +00:00
• 689ff36534 don't be too funny philipp 2023-09-05 13:21:18 +02:00
• c5f3c8d1f3 push philipp 2023-09-05 13:20:42 +02:00
• d07581aa3d [TASK] replace Freitag with Markttag for phipsi Marie Birner 2023-04-10 22:56:47 +02:00
• 31435e9c3b rename labels philipp 2023-08-09 23:39:11 +02:00
• 662f952807 Merge branch 'allow_to_add_real_guests' into 'staging' PhilippHofer 2023-08-09 20:30:37 +00:00
• 590b41aa33 Allow to add real guests PhilippHofer 2023-08-09 20:30:37 +00:00
• 723ada09b0 update deps philipp 2023-08-09 13:43:51 +02:00
• 4acefb3749 fix typo philipp 2023-08-09 12:43:30 +02:00
• 5deece48ea Merge branch 'staging' into 'main' PhilippHofer 2023-08-09 10:15:38 +00:00
• 0afd523e05 update faq philipp 2023-08-09 12:01:49 +02:00
• bd4ee5954c implement is_locked for trip_details philipp 2023-08-09 11:54:18 +02:00
• 21c5609b31 set test logbook data philipp 2023-08-05 16:58:20 +02:00
• f0c6bdac14 fix ci; clean code philipp 2023-08-05 16:29:58 +02:00
• 94a9d285be clean db philipp 2023-08-05 16:27:51 +02:00
• 64aefde8bc fix stat query philipp 2023-08-05 15:58:17 +02:00
• 7309b1f2b2 update unit tests; add location name in kiosk settting to cookie (to avoid specific redirects) philipp 2023-08-05 13:21:35 +02:00
• e459a4e2d9 store loation in kiosk cookie, to avoid having to handle each location separately philipp 2023-08-05 13:09:58 +02:00
• 351ba1ba4e fix tests, default redirect to linz kiosk philipp 2023-08-05 13:01:01 +02:00
• 23844243b8 Merge branch 'staging' of gitlab.com:PhilippHofer/rot into staging philipp 2023-08-05 12:59:23 +02:00
• 8a40dfe017 allow filter for kiosk, to only show boats at specific location philipp 2023-08-05 12:59:02 +02:00
• d556e67cee Merge branch 'staging' into 'main' PhilippHofer 2023-08-05 10:51:56 +00:00
• 2192bb73ed Merge branch 'fix-order-trips' into 'staging' PhilippHofer 2023-08-05 10:38:58 +00:00
• 6809a85749 add option to lock boat on damage philipp 2023-08-05 12:05:54 +02:00
• f3c18c6949 update mail address philipp 2023-08-02 18:36:38 +02:00
• 8eb8597293 allow optional different table in staging philipp 2023-08-02 15:02:03 +02:00
• ff31ad83fe add boatdamages functionality philipp 2023-08-02 14:29:19 +02:00
• f7e623b8c3 strip binary philipp 2023-08-01 14:53:06 +02:00
• f2baca668c add tests for tera/admin/planned_event philipp 2023-07-31 21:33:49 +02:00
• da6a16cd66 add tests for tera/admin/planned_event philipp 2023-07-31 21:29:03 +02:00
• 8fa8e17c5a add tests for tera/admin/planned_event philipp 2023-07-31 21:15:28 +02:00
• 96af3c3b17 create tests for /public philipp 2023-07-31 21:07:01 +02:00
• 91ffcbb720 Merge branch 'fix-order-trips' of gitlab.com:PhilippHofer/rot into fix-order-trips philipp 2023-07-31 20:12:56 +02:00
• 5b8dfb8284 fix order of displayed trips + events philipp 2023-07-31 08:18:37 +02:00
• 3730940aed add tests for tera/log.rs philipp 2023-07-31 20:09:03 +02:00
• 8b5be3fb41 add test for tera/admin/boat.rs philipp 2023-07-31 19:38:53 +02:00
• 47b534f8c3 create tests for model/logbook philipp 2023-07-31 19:10:34 +02:00
• adb26f6b91 create tests for model/rower.rs, Closes #32 philipp 2023-07-31 16:59:15 +02:00
• 32e6148844 use query_as instead of manual mapping philipp 2023-07-31 16:33:44 +02:00