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

#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

#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

• b4c04cbdd8 Merge pull request 'updates-meeting' (#1085) from updates-meeting into main main philipp 2025-06-17 22:53:40 +02:00
• aac99c86fa Merge pull request 'updates-meeting' (#1084) from updates-meeting into staging staging philipp 2025-06-17 22:53:07 +02:00
• 1f0bfb04e4 more updates after meeting Philipp Hofer 2025-06-17 22:52:04 +02:00
• 86b8d3a30d make clear where note is displayed Philipp Hofer 2025-06-17 22:29:08 +02:00
• da7a303efb Merge pull request 'fix(?) auto ci' (#1080) from fix-ci into main philipp 2025-06-13 11:08:03 +02:00
• 2e13acc0b0 Merge pull request 'fix-ci' (#1079) from fix-ci into staging philipp 2025-06-13 11:07:48 +02:00
• 0a31410ca5 fix(?) auto ci Philipp Hofer 2025-06-13 11:07:00 +02:00
• f793cb4a9a Merge pull request 'log if a cox creates a trip' (#1076) from log-trip-creation into main philipp 2025-06-09 08:36:49 +02:00
• 6a59634de3 Merge pull request 'log-trip-creation' (#1075) from log-trip-creation into staging philipp 2025-06-09 08:35:22 +02:00
• d3b2d78f9f log if a cox creates a trip Philipp Hofer 2025-06-09 08:33:50 +02:00
• 155adce2e9 Merge pull request 'add license' Fixes #1064' (#1071) from upd into main philipp 2025-05-29 16:06:34 +02:00
• 63a32f02bf Merge pull request 'add license' Fixes #1064' (#1070) from upd into staging philipp 2025-05-29 16:06:28 +02:00
• 9548cb4f0b add license' Fixes #1064 Philipp Hofer 2025-05-29 16:05:44 +02:00
• c42713b86e Merge pull request 'promote calendar in welcome-mail; even more robust name checking' (#1069) from upd into main philipp 2025-05-29 16:02:59 +02:00
• 429f0c1ddc Merge pull request 'upd' (#1068) from upd into staging philipp 2025-05-29 16:02:37 +02:00
• d5a92d8f79 promote calendar in welcome-mail; even more robust name checking Philipp Hofer 2025-05-29 16:01:22 +02:00
• aa3df2a294 Merge pull request 'use proper role instead of manully validating role' (#1066) from use-proper-role into main philipp 2025-05-29 12:12:54 +02:00
• 0354e4e190 Merge pull request 'fix tests' (#1067) from use-proper-role into staging philipp 2025-05-29 12:12:39 +02:00
• 7a2743046d fix tests Philipp Hofer 2025-05-29 12:11:48 +02:00
• 7935d1837f Merge pull request 'use-proper-role' (#1065) from use-proper-role into staging philipp 2025-05-29 12:11:13 +02:00
• 7027145a9a use proper role instead of manully validating role Philipp Hofer 2025-05-29 12:10:35 +02:00
• 782d68cd03 Merge pull request 'allow users name to start with ÄÜÖ' (#1063) from fix-uppercase-non-ascii-name into main philipp 2025-05-27 08:54:50 +02:00
• f769af279b Merge pull request 'fix-uppercase-non-ascii-name' (#1062) from fix-uppercase-non-ascii-name into staging philipp 2025-05-27 08:54:45 +02:00
• c6a2b529c3 allow users name to start with ÄÜÖ Philipp Hofer 2025-05-27 08:54:15 +02:00
• b0b2ad2148 Merge pull request 'improve text' (#1061) from nicer-text into main philipp 2025-05-26 23:42:53 +02:00
• de62585b64 Merge pull request 'nicer-text' (#1060) from nicer-text into staging philipp 2025-05-26 23:42:42 +02:00
• 09e06017c2 improve text Philipp Hofer 2025-05-26 23:41:08 +02:00
• 34ade37f2d Merge pull request 'add docs' (#1057) from docs into main philipp 2025-05-22 13:26:01 +02:00
• ac24be6c5e Merge pull request 'add docs' (#1056) from docs into staging philipp 2025-05-22 13:25:53 +02:00
• 138c0598e6 add docs Philipp Hofer 2025-05-22 13:25:14 +02:00
• 5b75ff5d38 Merge pull request 'add planned mod' (#1054) from restructure into main philipp 2025-05-22 13:08:03 +02:00
• 13976b02d8 Merge pull request 'add planned mod' (#1053) from restructure into staging philipp 2025-05-22 13:07:46 +02:00
• a42e0b3ed3 add planned mod Philipp Hofer 2025-05-22 13:06:26 +02:00
• 743359904a Merge pull request '[BUGFIX] add border top reservation' (#1052) from reservation-border into main philipp 2025-05-22 12:43:20 +02:00
• 3aef4fa971 Merge pull request 'reservation-border' (#1049) from reservation-border into staging philipp 2025-05-22 12:42:54 +02:00
• f46ddf249a Merge pull request 'slight restructure of trip' (#1051) from restructure into main philipp 2025-05-22 12:41:54 +02:00
• 29e9911653 Merge pull request 'restructure' (#1050) from restructure into staging philipp 2025-05-22 12:41:49 +02:00
• bc6244bc03 slight restructure of trip Philipp Hofer 2025-05-22 12:41:01 +02:00
• 47e3d1b5b3 [BUGFIX] add border top reservation Marie Birner 2025-05-22 12:34:05 +02:00
• d6b9a2f11b Merge pull request 'board members can delete trips, proper notification + succ message is created' (#1048) from board-can-delete-trips into main philipp 2025-05-21 09:58:20 +02:00
• eca711e572 Merge pull request 'board members can delete trips, proper notification + succ message is created' (#1047) from board-can-delete-trips into staging philipp 2025-05-21 09:58:14 +02:00
• 4e04b2b082 board members can delete trips, proper notification + succ message is created Philipp Hofer 2025-05-21 09:56:45 +02:00
• 73a7abd418 Merge pull request 'allow scheckbuch finances editing via /user/fees' (#1046) from consistent-user-management into main philipp 2025-05-17 16:36:04 +02:00
• 09aa0fc136 Merge pull request 'allow scheckbuch finances editing via /user/fees' (#1045) from consistent-user-management into staging philipp 2025-05-17 16:35:57 +02:00
• abd58766d8 allow scheckbuch finances editing via /user/fees Philipp Hofer 2025-05-17 16:34:50 +02:00
• 58a357fdb5 Merge pull request 'ernst + board got rowingbadge notification on every trip of ernst, bc last 'wanderfahrt' was removed' (#1044) from dont-repeatedly-get-price into main philipp 2025-05-17 16:24:22 +02:00
• cc9505ca1e Merge pull request 'dont-repeatedly-get-price' (#1043) from dont-repeatedly-get-price into staging philipp 2025-05-17 16:24:00 +02:00
• 5202060e2f ernst + board got rowingbadge notification on every trip of ernst, bc last 'wanderfahrt' was removed Philipp Hofer 2025-05-17 16:23:24 +02:00
• 129c90f1aa Merge pull request 'format & lanaguage improv' (#1042) from language-improvement into main philipp 2025-05-17 15:59:58 +02:00
• 22f70f533a Merge pull request 'language-improvement' (#1041) from language-improvement into staging philipp 2025-05-17 15:59:51 +02:00
• 64b3e63e15 format & lanaguage improv Philipp Hofer 2025-05-17 15:59:15 +02:00
• e631ee67b5 Merge pull request 'default duration in cal of trips with type Lange Ausfahrt -> 6 hrs (instead of 3); Fixes #939' (#1039) from longer-long-trips into main philipp 2025-05-17 10:09:09 +02:00
• 6df029b4a7 Merge pull request 'default duration in cal of trips with type Lange Ausfahrt -> 6 hrs (instead of 3); Fixes #939' (#1040) from longer-long-trips into staging philipp 2025-05-17 10:08:58 +02:00
• 63edc3d249 default duration in cal of trips with type Lange Ausfahrt -> 6 hrs (instead of 3); Fixes #939 Philipp Hofer 2025-05-17 10:08:07 +02:00
• 61016f284c Merge pull request 'add nx link' (#1038) from nx-link into main philipp 2025-05-17 09:55:27 +02:00
• 1d4d59842b Merge pull request 'nx-link' (#1037) from nx-link into staging philipp 2025-05-17 09:55:22 +02:00
• 18348e68f3 add nx link Philipp Hofer 2025-05-17 09:54:46 +02:00
• 7730de8ada Merge pull request 'more-activities' (#1036) from more-activities into main philipp 2025-05-17 09:50:08 +02:00
• a63d29a42a Merge pull request 'more-activities' (#1035) from more-activities into staging philipp 2025-05-17 09:50:01 +02:00
• 066f47d99d linting Philipp Hofer 2025-05-17 09:49:11 +02:00
• f7bb394236 remove more logs w/ activities Philipp Hofer 2025-05-17 09:48:45 +02:00
• b3033fbc72 Merge pull request 'use formatted_names in roles' (#1034) from format-roles into main philipp 2025-05-17 09:13:49 +02:00
• 1f4ebc31ed Merge pull request 'use formatted_names in roles' (#1033) from format-roles into staging philipp 2025-05-17 09:13:43 +02:00
• c246e06e69 use formatted_names in roles Philipp Hofer 2025-05-17 09:13:06 +02:00
• 0dca843d6a Merge pull request 'already in db' (#1032) from already-in-db into main philipp 2025-05-17 09:08:03 +02:00
• 50cd3c2d75 Merge pull request 'already-in-db' (#1031) from already-in-db into staging philipp 2025-05-17 09:07:40 +02:00
• e334cea0e2 already in db Philipp Hofer 2025-05-17 08:15:59 +02:00
• 7e10253e2e Merge pull request 'reflect new fee structure' (#1029) from new-fee-structure into main philipp 2025-05-17 08:14:04 +02:00
• 0edd796f73 Merge pull request 'new-fee-structure' (#1028) from new-fee-structure into staging philipp 2025-05-16 23:19:20 +02:00
• dc75e0145a reflect new fee structure Philipp Hofer 2025-05-16 23:02:40 +02:00
• 1e2dc4ccbc Merge pull request 'auto update both branches' (#1026) from auto-update-both-branches into main philipp 2025-05-15 22:26:57 +02:00
• e883c0e6e2 Merge pull request 'auto-update-both-branches' (#1025) from auto-update-both-branches into staging philipp 2025-05-15 22:26:24 +02:00
• 4bcba1ec47 auto update both branches Philipp Hofer 2025-05-15 22:25:27 +02:00
• 452a1e1b97 Merge pull request 'fix ci' (#1024) from fix/ci into main philipp 2025-05-14 23:46:06 +02:00
• d2390ca5c2 Merge pull request 'fix/ci' (#1023) from fix/ci into staging philipp 2025-05-14 23:45:29 +02:00
• 412b733e30 fix ci Philipp Hofer 2025-05-14 23:44:53 +02:00
• 965cba0919 Merge pull request 'improve logging' (#1022) from improve-logging into main philipp 2025-05-14 23:01:39 +02:00
• 4906b757b8 Merge pull request 'improve logging' (#1021) from improve-logging into staging philipp 2025-05-14 23:01:12 +02:00
• dae8632a34 improve logging Philipp Hofer 2025-05-14 23:00:17 +02:00
• 55bdca4238 Merge pull request 'add auto-update; Progress at #503' (#1020) from auto-update into main philipp 2025-05-14 08:31:49 +02:00
• 0b62f59d19 Merge pull request 'add auto-update; Progress at #503' (#1019) from auto-update into staging philipp 2025-05-14 08:31:42 +02:00
• bf7dab235c add auto-update; Progress at #503 Philipp Hofer 2025-05-14 08:31:04 +02:00
• bb3e8dadb7 Merge pull request 'not so much clutter when addding notes' (#1018) from nicer-notes into main philipp 2025-05-14 08:15:57 +02:00
• 924683511c Merge pull request 'nicer-notes' (#1016) from nicer-notes into staging philipp 2025-05-14 08:15:46 +02:00
• ed6d05eb9e not so much clutter when addding notes Philipp Hofer 2025-05-14 08:04:56 +02:00
• edcdc74c1c Merge pull request 'start replacing activitybuilder' (#1015) from acitvities-adaption into main philipp 2025-05-12 23:09:46 +02:00
• d7d6eb2b43 Merge pull request 'start replacing activitybuilder' (#1014) from acitvities-adaption into staging philipp 2025-05-12 23:09:27 +02:00
• 3ab1dbd1f1 start replacing activitybuilder Philipp Hofer 2025-05-12 23:08:45 +02:00
• 6e9367fa07 Merge pull request 'prepare to remove old log, in favor of activities' (#1013) from acitvities-adaption into main philipp 2025-05-12 22:32:19 +02:00
• 4859890389 Merge pull request 'prepare to remove old log, in favor of activities' (#1012) from acitvities-adaption into staging philipp 2025-05-12 22:32:04 +02:00
• e4a8caf632 prepare to remove old log, in favor of activities Philipp Hofer 2025-05-12 22:29:34 +02:00
• cd39f1a694 Merge pull request 'clean duplicate speicifications' (#1009) from clean-backend-code into main philipp 2025-05-11 20:56:11 +02:00
• 4f34cc180c Merge pull request 'clean-backend-code' (#1008) from clean-backend-code into staging philipp 2025-05-11 20:55:49 +02:00
• 396fc8e659 clean duplicate speicifications Philipp Hofer 2025-05-11 20:52:13 +02:00
• f86d2f6307 Merge pull request 'fix notification' (#1007) from fix-notification into main philipp 2025-05-10 15:48:39 +02:00
• 3c26381901 Merge pull request 'fix-notification' (#1006) from fix-notification into staging philipp 2025-05-10 15:48:34 +02:00
• 1ecde79593 fix notification Philipp Hofer 2025-05-10 15:47:25 +02:00
• e8b8ba393f Merge pull request 'inform new cox about things' (#1004) from informat-new-cox into main philipp 2025-05-09 13:06:29 +02:00
• e01f9806bd Merge pull request 'inform new cox about things' (#1003) from informat-new-cox into staging philipp 2025-05-09 13:05:31 +02:00
• 3801c7ce8c inform new cox about things Philipp Hofer 2025-05-09 13:04:51 +02:00