Commit Graph

Select branches

Hide Pull Requests

main

separate-scheckbuch-user

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

#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

#95

#97

#98

#99

test

Mono Color

• 22bfe48d18 Merge pull request 'update deps' (#610) from update-deps into main philipp 2024-06-27 07:59:27 +02:00
• c379a6ca79 Merge pull request 'update deps' (#609) from update-deps into staging philipp 2024-06-27 07:59:15 +02:00
• 3543ffe9e1 update deps philipp 2024-06-27 07:58:30 +02:00
• 1d6770f11b Merge pull request 'minor visual improvements' (#608) from restructure-user into staging philipp 2024-06-24 19:57:08 +02:00
• 1ad6509568 minor visual improvements philipp 2024-06-24 19:56:35 +02:00
• 705f2ddc52 Merge pull request 'restructure-user' (#606) from restructure-user into staging philipp 2024-06-24 17:46:13 +02:00
• dba1e08c5d [TASK] quick restructure of user screen Marie Birner 2024-06-24 16:58:19 +02:00
• 1dc0c9c0e1 Merge pull request 'update iban' (#605) from update-iban into main philipp 2024-06-24 15:03:54 +02:00
• 45004567ed Merge pull request 'update-iban' (#604) from update-iban into staging philipp 2024-06-24 15:03:47 +02:00
• 3dff956544 update iban philipp 2024-06-24 15:02:55 +02:00
• 79f8efc34b Merge pull request 'allow vorstand to send mail + notifications' (#603) from allow-vorstand-to-send-things into main philipp 2024-06-21 11:25:27 +02:00
• 5c31fac230 Merge pull request 'allow vorstand to send mail + notifications' (#602) from allow-vorstand-to-send-things into staging philipp 2024-06-21 11:25:09 +02:00
• 3e983e05f9 allow vorstand to send mail + notifications philipp 2024-06-21 11:24:14 +02:00
• 8f91cc4e88 Merge pull request 'allow vorstand to send mail + notifications' (#601) from allow-vorstand-to-send-things into main philipp 2024-06-21 11:15:37 +02:00
• c55f9743aa Merge pull request 'allow-vorstand-to-send-things' (#600) from allow-vorstand-to-send-things into staging philipp 2024-06-21 11:15:30 +02:00
• 76290a64ae allow vorstand to send mail + notifications philipp 2024-06-21 11:14:48 +02:00
• 4b48fbaa82 Merge pull request 'update deps' (#599) from update-deps into main philipp 2024-06-19 13:44:08 +02:00
• d25cd491d0 Merge pull request 'update deps' (#598) from update-deps into staging philipp 2024-06-19 13:44:07 +02:00
• def8affb5f update deps philipp 2024-06-19 13:43:04 +02:00
• dfa7be9928 Merge pull request 'fix migration' (#597) from fix-migration into main philipp 2024-06-16 20:15:58 +02:00
• 03a467270d Merge pull request 'fix migration' (#596) from fix-migration into staging philipp 2024-06-16 20:15:54 +02:00
• 2159696112 fix migration test philipp 2024-06-16 20:00:44 +02:00
• 1c04462c30 Merge pull request 'add more life to the mails :-)' (#595) from more-sympatic-welcome-mail into main philipp 2024-06-15 18:28:24 +02:00
• 7af53203f8 Merge pull request 'more-sympatic-welcome-mail' (#594) from more-sympatic-welcome-mail into staging philipp 2024-06-15 18:28:09 +02:00
• b2393eb6ec mb is too serious philipp 2024-06-15 18:27:09 +02:00
• a5e82851ba fix missing word philipp 2024-06-10 22:23:26 +02:00
• 80725e223b add more life to the mails :-) philipp 2024-06-10 22:17:41 +02:00
• 39bde35864 Merge pull request 'add wifi pw in welcome mail' (#593) from add-wifi-pw-new-members into main philipp 2024-06-10 22:08:18 +02:00
• 70be6726db Merge pull request 'add-wifi-pw-new-members' (#592) from add-wifi-pw-new-members into staging philipp 2024-06-10 22:08:10 +02:00
• 5f301324ee add wifi pw in welcome mail philipp 2024-06-10 22:07:14 +02:00
• 9558965e8f Merge pull request 'require necessary fields' (#591) from require-necessary-fields into main philipp 2024-06-10 20:59:43 +02:00
• 08fc324cc6 Merge pull request 'require-necessary-fields' (#590) from require-necessary-fields into staging philipp 2024-06-10 20:59:38 +02:00
• 5f4d8982a8 require necessary fields philipp 2024-06-10 20:58:42 +02:00
• 0e2ef9e256 Merge pull request 'add trailer reservation funcitonality; Fixes #443' (#588) from trailer-reservation into main philipp 2024-06-10 20:00:25 +02:00
• df007524ed Merge pull request 'merged :-)' (#589) from trailer-reservation into staging philipp 2024-06-10 20:00:07 +02:00
• 1dc91f4f28 merged :-) philipp 2024-06-10 19:59:39 +02:00
• 5720767af3 Merge pull request 'add trailer reservation funcitonality; Fixes #443' (#587) from trailer-reservation into staging philipp 2024-06-10 19:58:13 +02:00
• f56da43723 fix copied stuff philipp 2024-06-10 19:48:16 +02:00
• 9dc1ec6fa0 add trailer reservation funcitonality; Fixes #443 philipp 2024-06-10 19:43:59 +02:00
• c9b67f5790 Merge pull request 'add delete trip button in edit window; Fixes #449' (#586) from delte-trip-btn into main philipp 2024-06-10 19:08:22 +02:00
• 1215bdbd84 Merge pull request 'delte-trip-btn' (#585) from delte-trip-btn into staging philipp 2024-06-10 19:08:17 +02:00
• 16687e39ab remove unused attribute philipp 2024-06-10 19:07:55 +02:00
• 957c474389 add delete trip button in edit window; Fixes #449 philipp 2024-06-10 19:07:05 +02:00
• f7aed68423 Merge pull request 'show if a user has < 30 km to thousand km trip, Fixes #551' (#582) from thousand-km-trips into main philipp 2024-06-10 15:50:31 +02:00
• 01637d0800 Merge pull request 'use proper hydro license; add fluctuation' (#584) from proper-hydro into main philipp 2024-06-10 15:49:51 +02:00
• 734490efe7 Merge pull request 'use proper hydro license; add fluctuation' (#583) from proper-hydro into staging philipp 2024-06-10 15:49:43 +02:00
• 0a77011170 use proper hydro license; add fluctuation philipp 2024-06-10 15:48:49 +02:00
• 980fcc0c0c Merge pull request 'thousand-km-trips' (#581) from thousand-km-trips into staging philipp 2024-06-10 15:12:57 +02:00
• dea0c65da3 fix ci + add test philipp 2024-06-10 15:12:23 +02:00
• 31bf38f112 show if a user has < 30 km to thousand km trip, Fixes #551 philipp 2024-06-10 14:55:01 +02:00
• 6b29907596 Merge pull request 'fix boat select' (#580) from fix-boat-select into main philipp 2024-06-10 11:01:47 +02:00
• 84f23e6e55 Merge pull request 'fix boat select' (#579) from fix-boat-select into staging philipp 2024-06-10 11:01:39 +02:00
• 7b17c30ce2 fix boat select philipp 2024-06-10 11:00:54 +02:00
• ec4068e499 Merge pull request 'cleaner cal' (#578) from cleaner-cal into main philipp 2024-06-06 17:22:14 +02:00
• 36193e3a64 Merge pull request 'cleaner cal' (#577) from cleaner-cal into staging philipp 2024-06-06 17:22:13 +02:00
• fca19745f8 even nicer cal entries philipp 2024-06-06 17:21:55 +02:00
• bb48ddb3de fix ci philipp 2024-06-06 17:17:40 +02:00
• 34b098fa2a cleaner cal philipp 2024-06-06 17:16:47 +02:00
• df1a06531f Merge pull request 'try new badge :-)' (#576) from add-badge into main philipp 2024-06-06 10:48:51 +02:00
• c6e3458588 Merge pull request 'add-badge' (#575) from add-badge into staging philipp 2024-06-06 10:48:30 +02:00
• 7b499fb457 try new badge :-) philipp 2024-06-06 10:38:18 +02:00
• d00570ff2f Merge pull request 'nicer-cal' (#574) from nicer-cal into main philipp 2024-06-06 07:11:43 +02:00
• a0528c1c65 Merge pull request 'nicer-cal' (#573) from nicer-cal into staging philipp 2024-06-06 07:11:32 +02:00
• bd63f2c386 use new additional information in test philipp 2024-06-06 06:59:41 +02:00
• e1b78b2725 don't lose trip_type on event cancellation; don't add empty notes in cal philipp 2024-06-06 06:57:43 +02:00
• fa14cfbf83 add cancellation, trip_type and notes to cal export philipp 2024-06-06 06:47:41 +02:00
• 5f6cb9a12b Merge pull request 'update deps' (#572) from update-deps into main philipp 2024-06-05 15:07:08 +02:00
• 5e4d708884 Merge pull request 'update-deps' (#571) from update-deps into staging philipp 2024-06-05 15:07:04 +02:00
• 1cac70cabb update deps philipp 2024-06-05 14:57:28 +02:00
• 09cb8ebfa9 Merge pull request 'allow-event-triptype-update' (#570) from allow-event-triptype-update into main philipp 2024-06-04 08:32:57 +02:00
• 6e41758104 Merge pull request 'allow-event-triptype-update' (#569) from allow-event-triptype-update into staging philipp 2024-06-04 08:32:54 +02:00
• ab88ce3230 fix tests philipp 2024-06-04 08:13:24 +02:00
• 30a6bc7109 allow event trip_type update philipp 2024-06-04 08:12:20 +02:00
• 99409f9407 Merge pull request 'remove space' (#568) from fix-spaces into main philipp 2024-06-02 14:53:14 +02:00
• c916381fb0 Merge pull request 'fix-spaces' (#567) from fix-spaces into staging philipp 2024-06-02 14:53:06 +02:00
• 7eff2a948a remove space philipp 2024-06-02 14:52:07 +02:00
• 243838fd44 Merge pull request 'remove debug println; better phrasing' (#566) from better-text into main philipp 2024-05-30 18:53:42 +02:00
• 7d44204533 Merge pull request 'remove debug println; better phrasing' (#565) from better-text into staging philipp 2024-05-30 18:53:35 +02:00
• 2de4c86c26 remove debug println; better phrasing philipp 2024-05-30 11:57:03 +02:00
• 2889d40d55 Merge pull request 'better-text' (#564) from better-text into main philipp 2024-05-30 11:52:17 +02:00
• 145892104b Merge pull request 'try' (#563) from better-text into staging philipp 2024-05-30 11:34:29 +02:00
• e8d4672176 try philipp 2024-05-30 11:34:01 +02:00
• 6c0f0e6b04 Merge pull request 'better-text' (#562) from better-text into staging philipp 2024-05-30 11:12:03 +02:00
• 1bd643f6f4 try philipp 2024-05-30 11:11:08 +02:00
• 562c32939d better phrasing of text philipp 2024-05-30 10:39:55 +02:00
• 3c0b8e5114 Merge pull request 'fix error' (#560) from fix-user-find-bug into main philipp 2024-05-28 15:04:50 +02:00
• e004d81ca1 Merge pull request 'fix error' (#559) from fix-user-find-bug into staging philipp 2024-05-28 15:04:26 +02:00
• 6d5ff5404b fix error philipp 2024-05-28 15:04:06 +02:00
• a8c0282918 Merge pull request 'migrated db' (#558) from migrated-db into main philipp 2024-05-28 11:27:46 +02:00
• 41b5aff329 Merge pull request 'migrated-db' (#557) from migrated-db into staging philipp 2024-05-28 11:27:41 +02:00
• 9973913af6 migrated db philipp 2024-05-28 11:26:22 +02:00
• 7055c999e8 Merge pull request 'rename role to manage_events' (#556) from reanme-to-event into main philipp 2024-05-28 11:18:50 +02:00
• 76c8456380 Merge pull request 'rename role to manage_events' (#555) from reanme-to-event into staging philipp 2024-05-28 10:56:04 +02:00
• c0d766832e rename role to manage_events philipp 2024-05-28 10:46:21 +02:00
• f88c0be781 Merge pull request 'reanme-to-event' (#554) from reanme-to-event into main philipp 2024-05-28 10:06:50 +02:00
• 95f43a73cf Merge pull request 'reanme-to-event' (#553) from reanme-to-event into staging philipp 2024-05-28 10:06:48 +02:00
• 91fa2a7762 add test for cancel-event-notification philipp 2024-05-28 09:59:16 +02:00
• 82aa94c024 rename planned_event to event philipp 2024-05-28 09:08:48 +02:00
• aaf09208f3 Merge pull request 'don't care about cases for username' (#550) from case-insensitive-auth into main philipp 2024-05-27 08:33:07 +02:00
• 3d340bf803 Merge pull request 'case-insensitive-auth' (#549) from case-insensitive-auth into staging philipp 2024-05-27 08:33:03 +02:00