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

#95

#97

#98

#99

test

Mono Color

• e94fc79580 deployed :-) philipp 2024-03-09 17:02:50 +01:00
• ee73509fc7 Merge pull request 'boatshouse' (#258) from boatshouse into main philipp 2024-03-09 17:00:11 +01:00
• 2445e82c69 Merge pull request 'boatshouse' (#259) from boatshouse into staging philipp 2024-03-09 16:59:56 +01:00
• ad2f2241aa show messages in kiosk mode philipp 2024-03-09 16:56:32 +01:00
• f14177d497 MB: styling of boathouse philipp 2024-03-09 16:49:04 +01:00
• 1e96c113a9 single location for flash message philipp 2024-03-09 16:15:47 +01:00
• 75be5d3ca2 Merge pull request 'boatshouse' (#257) from boatshouse into staging philipp 2024-03-08 22:23:42 +01:00
• 5da1900ae8 Merge pull request 'no fee for 'ehrenmitglieder' (#256) from staging into main philipp 2024-03-08 13:58:42 +01:00
• a61f7cebbb no fee for 'ehrenmitglieder philipp 2024-03-08 13:57:45 +01:00
• 69edb63ddd styling philipp 2024-03-08 13:46:00 +01:00
• 3deb1e40fc boatshouse functionality, fixes #183 philipp 2024-03-08 13:13:20 +01:00
• 92a1a8278d Merge pull request 'update filter' (#255) from staging into main philipp 2024-03-08 10:17:13 +01:00
• 7e6b577315 update filter philipp 2024-03-08 10:16:36 +01:00
• 754f746094 Merge pull request 'add schnupper management' (#254) from staging into main philipp 2024-03-06 15:55:49 +01:00
• edb42717bc add schnupper management philipp 2024-03-06 15:55:13 +01:00
• ef6fc3a349 Merge pull request 'clippy' (#253) from staging into main philipp 2024-03-06 13:28:53 +01:00
• a3ce96d4bf clippy philipp 2024-03-06 13:27:03 +01:00
• 25667af9c5 Merge pull request 'sort boats by name' (#252) from staging into main philipp 2024-03-06 08:16:11 +01:00
• 4af1f48ebf sort boats by name philipp 2024-03-06 08:15:18 +01:00
• 9f6d7bf5d7 Merge pull request 'fix ci' (#251) from staging into main philipp 2024-03-05 15:02:12 +01:00
• 8854ef36f3 fix ci philipp 2024-03-05 15:01:44 +01:00
• 3b9d743603 Merge pull request 'fix ci' (#250) from staging into main philipp 2024-03-05 14:29:58 +01:00
• ef4323b275 fix ci philipp 2024-03-05 14:29:27 +01:00
• 292e944783 Merge pull request 'fix ci' (#249) from staging into main philipp 2024-03-05 14:13:18 +01:00
• 1a662acf3b fix ci philipp 2024-03-05 14:12:57 +01:00
• 8c8b9b7aca Merge pull request 'staging' (#248) from staging into main philipp 2024-03-05 13:45:55 +01:00
• 94b622a5e7 update filter philipp 2024-03-05 13:45:19 +01:00
• aadc1b315e staging (#246) philipp 2024-03-05 09:46:53 +01:00
• 6f5fcd59ea fix ci philipp 2024-03-05 09:45:54 +01:00
• 7a6bea3c46 fix ci (#245) philipp 2024-03-05 09:35:08 +01:00
• 1a482db9e2 fix ci philipp 2024-03-05 09:34:50 +01:00
• 10a0e82392 fix ci philipp 2024-03-05 09:33:18 +01:00
• 6c2ff716e1 Merge pull request 'staging' (#244) from staging into main philipp 2024-03-05 09:19:50 +01:00
• 8b0cbe23d1 show year selector to admins for logbook philipp 2024-03-05 09:19:15 +01:00
• 58f8cb14b8 allow admins to show logbook for any year philipp 2024-03-05 08:59:44 +01:00
• 814e80864d Merge pull request 'fix wording' (#243) from staging into main philipp 2024-03-05 08:31:41 +01:00
• ae98a4278d fix wording philipp 2024-03-05 08:31:03 +01:00
• f3b97e0e49 Merge pull request 'fix ci?' (#242) from staging into main philipp 2024-03-05 07:51:12 +01:00
• 4b59cdfc8f fix ci? philipp 2024-03-05 07:50:43 +01:00
• bb6ba7730e Merge pull request 'remove timeout again' (#241) from staging into main philipp 2024-03-05 00:58:20 +01:00
• 16e7c2379a remove timeout again philipp 2024-03-05 00:56:40 +01:00
• 359e20e948 Merge pull request 'wait for webserver to respond with 2xx, fix failing first (flaky) test' (#239) from staging into main philipp 2024-03-05 00:53:35 +01:00
• 737af80c39 wait for webserver to respond with 2xx, fix failing first (flaky) test philipp 2024-03-05 00:53:09 +01:00
• b3779bfefd Merge pull request 'faster tests' (#238) from staging into main philipp 2024-03-05 00:46:42 +01:00
• 212ef5faa7 faster tests philipp 2024-03-05 00:46:19 +01:00
• 5cbdb2ae63 Merge pull request 'remove 1 minute timeout + use local timezone where appropriate and fix tests between 0 and 1 o'clock' (#237) from staging into main philipp 2024-03-05 00:17:56 +01:00
• 5078c5f341 use local timezone where appropriate and fix tests between 0 and 1 o'clock philipp 2024-03-05 00:17:02 +01:00
• 38d4899bf4 Merge pull request 'staging' (#236) from staging into main philipp 2024-03-04 23:12:05 +01:00
• 007b87e8ad add scheckbook functionality, Fixes #184 (#235) philipp 2024-03-04 23:11:44 +01:00
• c813e2b3da scheckbuch people don't get error philipp 2024-03-04 22:04:22 +01:00
• eed7718a3f Merge pull request 'alphabetically order stat if same ranking' (#233) from staging into main philipp 2024-03-04 17:12:40 +01:00
• 4a81d2d624 alphabetically order stat if same ranking philipp 2024-03-04 17:12:16 +01:00
• 2bff90b025 Merge pull request 'staging' (#232) from staging into main philipp 2024-03-04 17:01:53 +01:00
• 842cc00812 Merge branch 'staging' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into staging philipp 2024-03-04 17:01:33 +01:00
• ff6d8adefd add new functionality to menu philipp 2024-03-04 17:01:25 +01:00
• 2490428781 Merge pull request 'Create admin function to use copy-pasted users from ekey, return the ones which don't match to "Donau Linz" rowt user, Fixes #204 (#230)' (#231) from staging into main philipp 2024-03-04 17:00:06 +01:00
• 05b7b7fbbf Create admin function to use copy-pasted users from ekey, return the ones which don't match to "Donau Linz" rowt user, Fixes #204 (#230) philipp 2024-03-04 16:59:44 +01:00
• a269efedca Merge pull request 'show user icon in all vorstand users' (#229) from staging into main philipp 2024-03-04 16:38:50 +01:00
• 8edbf15235 show user icon in all vorstand users philipp 2024-03-04 16:37:53 +01:00
• e7168d308f Merge pull request 'fix link' (#228) from staging into main philipp 2024-03-04 15:57:34 +01:00
• b6a318df85 fix link philipp 2024-03-04 15:57:06 +01:00
• 11188bacbe Merge pull request 'reformat files' (#227) from staging into main philipp 2024-03-04 15:51:50 +01:00
• a1b5c26518 Merge branch 'main' into staging philipp 2024-03-04 15:18:56 +01:00
• dfa0eaeb4f fix ci, more output @ ci philipp 2024-03-04 14:55:11 +01:00
• 4eeb2162d8 fix spacing issues philipp 2024-03-04 14:28:19 +01:00
• df9f1c398b fix spacing issues philipp 2024-03-04 14:26:42 +01:00
• 62ff5f0c2e fix spacing issues philipp 2024-03-04 14:25:14 +01:00
• ee17bc2ab3 fix tests philipp 2024-03-04 14:08:46 +01:00
• eb483d9959 also verify logbook entry successfully created philipp 2024-03-04 14:04:13 +01:00
• c98170636b show proper amount of guests philipp 2024-03-04 13:35:13 +01:00
• 442257df01 reformat files philipp 2024-03-04 13:28:42 +01:00
• ec5a69f3e6 Merge branch 'notification' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into notification philipp 2024-03-04 10:03:59 +01:00
• 09fffa1830 add table philipp 2024-01-10 14:20:30 +01:00
• 28acee3085 notifications philipp 2023-11-17 10:30:30 +01:00
• 7ce535f500 Merge pull request 'staging' (#226) from staging into main philipp 2024-03-04 10:03:14 +01:00
• e338c78d04 Merge pull request 'allow vorstand to see member details, Fixes #199' (#225) from show-members-vorstand into staging philipp 2024-03-04 09:56:29 +01:00
• 0de21e9abb add tests and fix npm build, make frontend tests work @ mobile view philipp 2024-03-04 09:55:39 +01:00
• 9c3ae7434e allow vorstand to see member details, Fixes #199 philipp 2024-03-04 09:19:04 +01:00
• 996fcdc14f Merge pull request 'Allow 'Rennjugend' to use all boats in ottensheim, Fixes #200' (#222) from ottensheim-boats into staging philipp 2024-03-03 20:06:29 +01:00
• 5781937bee show ottensheim boats to rennjugend philipp 2024-03-03 20:03:20 +01:00
• d1296ec40a show ottensheim boats to rennjugend philipp 2024-03-03 18:08:15 +01:00
• 29284b30a6 Merge pull request 'update deps and fix ci' (#219) from staging into main philipp 2024-03-01 09:09:34 +01:00
• cc7ba59407 update deps and fix ci philipp 2024-03-01 09:08:50 +01:00
• 966254807c Merge pull request 'allow sending mails w/o attachments :-)' (#218) from staging into main philipp 2024-03-01 08:41:12 +01:00
• 770e321bed allow sending mails w/o attachments :-) philipp 2024-03-01 08:40:02 +01:00
• 4f6dacb907 Merge pull request 'use old lock file to make ci work' (#216) from staging into main philipp 2024-02-21 15:39:22 +01:00
• f7a7ab8733 use old lock file to make ci work philipp 2024-02-21 15:35:12 +01:00
• 4ddac52a93 Merge pull request 'increase timeout for frontend tests' (#215) from staging into main philipp 2024-02-21 15:08:31 +01:00
• 65e425fed7 increase timeout for frontend tests philipp 2024-02-21 15:06:35 +01:00
• cdd57eb147 Merge pull request 'code cleanup' (#214) from staging into main philipp 2024-02-21 14:47:54 +01:00
• 6ed28994c6 code cleanup philipp 2024-02-21 14:46:17 +01:00
• 4a0026a9ee Merge pull request 'staging' (#213) from staging into main philipp 2024-02-21 13:58:29 +01:00
• e9bee963fe update deps philipp 2024-02-21 13:58:03 +01:00
• 75d7396b96 push philipp 2024-02-17 12:48:25 +01:00
• 9746a2114c push philipp 2024-02-17 12:47:06 +01:00
• ce2e4e5219 Merge pull request 'dont expect money from deleted users :-)' (#212) from staging into main philipp 2024-02-16 13:14:49 +01:00
• 6e0c594c84 dont expect money from deleted users :-) philipp 2024-02-16 13:13:57 +01:00
• b2fd52e4a5 Merge pull request 'also remove js function for (unnecessary) filtering of months' (#211) from staging into main philipp 2024-02-16 10:48:05 +01:00
• fe2ca0f33a also remove js function for (unnecessary) filtering of months philipp 2024-02-16 10:47:28 +01:00
• 14fbfd200b Merge pull request 'remove useless button' (#210) from staging into main philipp 2024-02-16 08:05:57 +01:00