Commit Graph

Select branches

Hide Pull Requests

improve-logbook-entry-update

main

mb-npm-choices

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

#1092

#1093

#1094

#1096

#1097

#1098

#1099

#110

#1100

#1101

#1102

#1103

#1104

#1105

#1106

#1107

#1108

#1109

#111

#1110

#1111

#1112

#1113

#1114

#1115

#1116

#1117

#1118

#1119

#1120

#1121

#1122

#1123

#1124

#1125

#1126

#1127

#1129

#1130

#1131

#1132

#1133

#1134

#1135

#1136

#1137

#1138

#1139

#1140

#1141

#1142

#1143

#1144

#1145

#1146

#1147

#1148

#1149

#115

#1150

#1151

#1152

#1153

#1154

#1155

#1156

#1157

#1158

#1159

#116

#1160

#1161

#1162

#1163

#1164

#1165

#1167

#1168

#1169

#117

#1170

#1172

#1173

#1174

#1175

#1176

#1177

#1178

#1179

#118

#1180

#1181

#1182

#1183

#1184

#1185

#1186

#1187

#1188

#1189

#119

#1190

#1191

#1192

#1193

#1194

#1195

#1196

#1197

#1198

#1199

#120

#1200

#1201

#1202

#1203

#1204

#1205

#1206

#1207

#1208

#1209

#121

#1210

#1211

#1212

#1213

#1214

#1215

#1216

#1217

#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

• 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
• 86f7ca7065 don't care about cases for username philipp 2024-05-27 08:32:00 +02:00
• e325e0478a Merge pull request 'better spacing' (#548) from fix-spacing into main philipp 2024-05-26 18:48:07 +02:00
• ae096ad602 Merge pull request 'better spacing' (#547) from fix-spacing into staging philipp 2024-05-26 18:47:51 +02:00
• 0298617fc9 better spacing philipp 2024-05-26 18:47:09 +02:00
• 02ff89ba34 Merge pull request 'fix spacing' (#546) from fix-spacing into main philipp 2024-05-26 14:18:13 +02:00
• 25d8b1ea7c Merge pull request 'fix-spacing' (#545) from fix-spacing into staging philipp 2024-05-26 14:18:07 +02:00
• 47a543fa64 fix spacing philipp 2024-05-26 14:17:26 +02:00
• 4e8fd84134 Merge pull request 'fix typo' (#544) from type into main philipp 2024-05-25 18:53:00 +02:00
• 410cd05acc Merge pull request 'type' (#543) from type into staging philipp 2024-05-25 18:52:45 +02:00
• 544267a037 fix typo philipp 2024-05-25 18:52:00 +02:00
• 97b0ae83a9 Merge pull request 'extend log filter' (#540) from filter-logs into main philipp 2024-05-22 23:42:19 +02:00
• 972811c2cf Merge pull request 'filter-logs' (#539) from filter-logs into staging philipp 2024-05-22 23:42:06 +02:00
• f6d8c07c08 extend log filter philipp 2024-05-22 23:41:24 +02:00
• da56723909 Merge pull request 'fix footer' (#538) from fix-footer into main philipp 2024-05-22 22:51:54 +02:00
• e22d2d718e Merge pull request 'fix-footer' (#537) from fix-footer into staging philipp 2024-05-22 22:51:39 +02:00
• 603aed8394 fix footer philipp 2024-05-22 22:51:10 +02:00
• f22d3b65be Merge pull request 'only allow realistic values for logbook entries' (#536) from sanity-check-timing into main philipp 2024-05-22 22:41:35 +02:00
• b55f122f1d Merge pull request 'sanity-check-timing; fixes #488' (#535) from sanity-check-timing into staging philipp 2024-05-22 22:41:31 +02:00
• 446e48020e test fails due to new sanity check (25km in 1 min :-)); started trip 2 hours ago now in tests philipp 2024-05-22 22:28:33 +02:00
• 93e3e0ef5c only allow realistic values for logbook entries philipp 2024-05-22 22:05:03 +02:00
• 8f5cc70981 Merge pull request 'automate schnupper mails' (#534) from automate-schnupper-mails into main philipp 2024-05-22 08:51:41 +02:00
• d27489d714 Merge pull request 'automate-schnupper-mails' (#533) from automate-schnupper-mails into staging philipp 2024-05-22 08:51:39 +02:00
• 71c228f202 automate schnupper mails philipp 2024-05-22 08:30:38 +02:00
• 3ebde6afce Merge pull request 'allow to add reason for canceled event; fixes #530' (#532) from reason-for-canceled-event into main philipp 2024-05-22 08:13:58 +02:00
• c340d1a916 Merge pull request 'reason-for-canceled-event' (#531) from reason-for-canceled-event into staging philipp 2024-05-22 08:13:55 +02:00
• a797180b0d allow to add reason for canceled event; fixes #530 philipp 2024-05-22 08:04:17 +02:00
• 9704893329 Merge pull request 'fix ci' (#529) from fix-ci into main philipp 2024-05-22 00:24:46 +02:00
• e7732b9e96 Merge pull request 'fix-ci' (#528) from fix-ci into staging philipp 2024-05-22 00:24:22 +02:00
• 05c4c4f6a2 fix ci philipp 2024-05-22 00:23:51 +02:00
• daf9460bf7 Merge pull request 'clean code with clippy' (#527) from clippy into main philipp 2024-05-22 00:18:47 +02:00
• 97dc9308bc Merge pull request 'clippy' (#526) from clippy into staging philipp 2024-05-22 00:18:35 +02:00
• db5e0873a6 Merge branch 'staging' into clippy philipp 2024-05-22 00:18:17 +02:00
• 40f97f18a9 clean code with clippy philipp 2024-05-22 00:13:23 +02:00
• 6b911f242a Merge pull request 'fix html duplicate tags' (#525) from fix-html into main philipp 2024-05-21 23:46:17 +02:00
• f4ce748a74 Merge pull request 'fix html duplicate tags' (#524) from fix-html into staging philipp 2024-05-21 23:46:14 +02:00
• d4ffd8850e fix html duplicate tags philipp 2024-05-21 23:35:36 +02:00
• c93556a5ab Merge pull request 'allow cancel of events' (#522) from allow-cancel-of-events into staging philipp 2024-05-21 22:39:56 +02:00
• 96ce46d39c Merge branch 'main' into allow-cancel-of-events philipp 2024-05-21 22:19:33 +02:00
• 412ec27927 Merge pull request 'remove notificatoin about canceled trip if cancelation has been canceled' (#521) from remove-notification into main philipp 2024-05-21 22:18:11 +02:00
• a1c7e4c690 Merge pull request 'remove-notification' (#520) from remove-notification into staging philipp 2024-05-21 22:17:56 +02:00
• 1f0de7abf4 allow cancel of events philipp 2024-05-21 22:16:42 +02:00
• 64f3596132 remove notificatoin about canceled trip if cancelation has been canceled philipp 2024-05-21 20:43:05 +02:00
• 3b75f38dca Merge pull request 'remove users from trip after they have read the notificatoin' (#518) from remove-users-from-canceled-trips-after-reading-notification into main philipp 2024-05-21 20:01:25 +02:00
• 10f2e3016a Merge pull request 'Merge pull request 'allow for sending notifications to single users' (#516) from allow-notifications-for-single-user into main' (#517) from remove-users-from-canceled-trips-after-reading-notification into staging philipp 2024-05-21 20:01:17 +02:00
• 1069e29cf0 fix ci philipp 2024-05-21 19:47:10 +02:00
• b4967b54e9 remove users from trip after they have read the notificatoin philipp 2024-05-21 19:41:00 +02:00
• 1285c3bc28 Merge pull request 'allow for sending notifications to single users' (#516) from allow-notifications-for-single-user into main philipp 2024-05-21 19:27:41 +02:00
• b6c9cb0b99 Merge pull request 'allow-notifications-for-single-user' (#515) from allow-notifications-for-single-user into staging philipp 2024-05-21 19:27:36 +02:00
• 29fabb04b0 allow for sending notifications to single users philipp 2024-05-21 18:57:24 +02:00
• 830aa58e7b Merge pull request 'don't allow to delete an event if someone is registered' (#514) from deletion-event-only-ok-noone-registered into main philipp 2024-05-21 18:44:54 +02:00
• 1b6aec8d89 Merge pull request 'deletion-event-only-ok-noone-registered' (#513) from deletion-event-only-ok-noone-registered into staging philipp 2024-05-21 18:44:47 +02:00
• 1bf1cc9c68 inform user in case event can't be deleted philipp 2024-05-21 18:34:17 +02:00
• 02e1f77f65 don't allow to delete an event if someone is registered philipp 2024-05-21 18:28:56 +02:00
• d819462b0d Merge pull request 'log if admin resets the pw for someone' (#512) from log-pw-reset into main philipp 2024-05-21 09:06:46 +02:00
• 387acdbd09 Merge pull request 'log if admin resets the pw for someone' (#511) from log-pw-reset into staging philipp 2024-05-21 09:06:37 +02:00
• b36144832a log if admin resets the pw for someone philipp 2024-05-21 09:05:36 +02:00