Commit Graph

Select branches

Hide Pull Requests

main

nx-auth

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

#92

#93

#94

#95

#97

#98

#99

test

Mono Color

• cf46032f24 Merge pull request 'improve error msg if event is locked' (#402) from improve-error-msg into staging philipp 2024-04-18 21:18:22 +02:00
• ff27eb5eed improve error msg if event is locked philipp 2024-04-18 21:17:26 +02:00
• aecfb27d6e Merge pull request 'notification-badge' (#400) from notification-badge into staging philipp 2024-04-17 14:43:37 +02:00
• 686feaf66b Merge branch 'main' into notification-badge philipp 2024-04-17 14:10:14 +02:00
• c658ea133d Merge pull request 'allow-boat-deletion' (#398) from allow-boat-deletion into staging philipp 2024-04-17 14:08:00 +02:00
• cf56e8f6fe Merge pull request 'allow deletion of boat' (#399) from allow-boat-deletion into main philipp 2024-04-17 14:07:55 +02:00
• 4bec5443a2 Merge pull request 'dont-show-steer-btn-when-no-coxes' (#396) from dont-show-steer-btn-when-no-coxes into staging philipp 2024-04-17 13:58:11 +02:00
• ee7c62c3b7 Merge pull request 'don't show steer button when there are no coxes planned for this event; Fixes #357' (#397) from dont-show-steer-btn-when-no-coxes into main philipp 2024-04-17 13:57:53 +02:00
• 42a3addd9a make it more clear which action is required if notifications are present philipp 2024-04-17 13:57:24 +02:00
• 7c71ce59bd show notification badge in menu philipp 2024-04-17 13:51:47 +02:00
• 858ae28eb3 allow deletion of boat philipp 2024-04-17 13:18:35 +02:00
• 55b259061b don't show steer button when there are no coxes planned for this event; Fixes #357 philipp 2024-04-17 13:04:03 +02:00
• e2746d5105 Merge pull request 'send creator of boatdamage notification when it has been repaired' (#395) from boatdamage-notification-to-creator into main philipp 2024-04-17 13:02:53 +02:00
• 1dd752f354 Merge pull request 'boatdamage-notification-to-creator' (#394) from boatdamage-notification-to-creator into staging philipp 2024-04-17 13:02:49 +02:00
• 22d499d38b send creator of boatdamage notification when it has been repaired philipp 2024-04-17 12:44:31 +02:00
• d0830e4631 Merge pull request 'don't clutter logs' (#393) from fix-logs into main philipp 2024-04-17 12:22:59 +02:00
• ef85d30846 Merge pull request 'fix-logs' (#392) from fix-logs into staging philipp 2024-04-17 12:22:32 +02:00
• 36d7c43bbd don't clutter logs philipp 2024-04-17 12:21:57 +02:00
• 3ff8067c51 Merge pull request '[TASK] change favicon to make it sharper' (#391) from favicon into main philipp 2024-04-17 11:41:59 +02:00
• 4d3af37d5f Merge pull request 'favicon' (#390) from favicon into staging philipp 2024-04-17 11:41:26 +02:00
• 0f96f39f24 [TASK] change favicon to make it sharper Marie Birner 2024-04-17 11:35:12 +02:00
• b32bdb5a70 Merge pull request 'styling-mail' (#389) from styling-mail into main philipp 2024-04-17 11:34:07 +02:00
• 6956e4c487 Merge pull request 'styling-mail' (#388) from styling-mail into staging philipp 2024-04-17 11:10:45 +02:00
• acb1c711e5 [TASK] style notification Marie Birner 2024-04-17 10:56:22 +02:00
• ec0bd91aa3 [TASK] styling mail Marie Birner 2024-04-17 10:54:07 +02:00
• de786c2b51 Merge pull request 'fix-spacing' (#387) from fix-spacing into main philipp 2024-04-16 20:07:11 +02:00
• 558f600271 Merge pull request 'no space before '/'' (#386) from fix-spacing into staging philipp 2024-04-16 20:06:33 +02:00
• 5c680a8bea no space before '/' philipp 2024-04-16 20:05:55 +02:00
• 74f4d4854a Merge pull request 'dont clutter logs' (#385) from usage-stats into main philipp 2024-04-16 10:00:45 +02:00
• 4b49b5517d Merge pull request 'dont clutter logs' (#384) from usage-stats into staging philipp 2024-04-16 10:00:05 +02:00
• 0cd623482c dont clutter logs philipp 2024-04-16 09:59:39 +02:00
• 0a01b95c85 Merge pull request 'fix ci' (#383) from usage-stats into main philipp 2024-04-16 09:08:26 +02:00
• 6daf2495a8 Merge pull request 'fix ci' (#381) from usage-stats into staging philipp 2024-04-16 09:07:31 +02:00
• 8771a378da fix ci philipp 2024-04-16 09:06:24 +02:00
• e84547c8ca Merge pull request 'log usage' (#380) from usage-stats into main philipp 2024-04-16 08:54:25 +02:00
• 872dcd0668 Merge pull request 'log usage' (#379) from usage-stats into staging philipp 2024-04-16 08:53:46 +02:00
• a9f74fcd3c log usage philipp 2024-04-16 08:52:37 +02:00
• 95752703ff Merge pull request 'clean w/ clippy' (#378) from clippy into main philipp 2024-04-15 23:37:27 +02:00
• 5e19a62c7e Merge pull request 'clippy' (#377) from clippy into staging philipp 2024-04-15 23:37:18 +02:00
• 2694829b6e clean w/ clippy philipp 2024-04-15 23:26:52 +02:00
• 151e1b7864 Merge pull request 'show steering person in logs if not cox' (#376) from show-steering-person-in-logs into main philipp 2024-04-15 22:04:14 +02:00
• 5965b1d626 Merge pull request 'show steering person in logs if not cox' (#375) from show-steering-person-in-logs into staging philipp 2024-04-15 22:03:39 +02:00
• 219b80377d show notification to vorstand if boat entry with 'externes boot' or on multiple days is entered philipp 2024-04-15 22:03:20 +02:00
• 8315a27ea8 fix tests (proper timezone), proper spacing philipp 2024-04-15 21:32:16 +02:00
• d070c7731a show steering person in logs if not cox philipp 2024-04-15 20:45:26 +02:00
• c8f614e2d2 Merge pull request 'staging' (#374) from staging into main philipp 2024-04-15 18:49:51 +02:00
• 4b07c11bc3 fix ci philipp 2024-04-15 18:24:18 +02:00
• 0bc00472d7 don't create any notification if we are working with planned_event philipp 2024-04-15 18:22:58 +02:00
• 37da4f2c3e Merge branch 'main' into staging philipp 2024-04-15 18:16:57 +02:00
• 74505c1554 add notification to all pot. coxes if trip is full philipp 2024-04-15 18:16:43 +02:00
• 1869b36e09 add notification on canceled trips; add explicit 'cancel trip' button philipp 2024-04-15 17:17:54 +02:00
• 13808d0103 Merge pull request 'staging' (#373) from staging into main philipp 2024-04-15 11:26:20 +02:00
• 4a3803df51 Merge branch 'main' into staging philipp 2024-04-15 11:25:49 +02:00
• d58d4642af 1x boats: don't show 'Ruderer: ' in logbook; Fixes #362 philipp 2024-04-15 11:23:07 +02:00
• c3fa5195d3 Merge pull request 'hide old verified boat damages' (#372) from hide-old-verified-boatdamages into main philipp 2024-04-14 21:40:39 +02:00
• c4a9a541d3 Merge pull request 'don't show external boats in boatstat; hide logout in menu; move owner into own column in boatstat' (#369) from updates into main philipp 2024-04-14 21:40:27 +02:00
• 8db9e020c8 Merge pull request 'hide old verified boat damages' (#371) from hide-old-verified-boatdamages into staging philipp 2024-04-14 20:28:42 +02:00
• 42277699a7 hide old verified boat damages philipp 2024-04-14 20:28:06 +02:00
• a1b78db750 Merge pull request 'don't show external boats in boatstat; hide logout in menu; move owner into own column in boatstat' (#368) from updates into staging philipp 2024-04-14 20:22:18 +02:00
• 7ebbf5661a don't show external boats in boatstat; hide logout in menu; move owner into own column in boatstat philipp 2024-04-14 20:20:22 +02:00
• 2ff08141ae Merge pull request 'steering' (#367) from steering into main philipp 2024-04-14 20:18:45 +02:00
• 297e0629a4 Merge pull request 'steering' (#366) from steering into staging philipp 2024-04-14 19:57:26 +02:00
• 213a80bd28 Merge branch 'staging' into steering philipp 2024-04-14 19:56:58 +02:00
• b111c4a1b9 lint html philipp 2024-04-14 18:38:41 +02:00
• db43ef628f [TASK] style steering html Marie Birner 2024-04-14 18:36:27 +02:00
• ccf9f41f4e Merge branch 'staging' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into staging philipp 2024-04-14 18:27:35 +02:00
• fb9e694919 add required role philipp 2024-04-14 18:27:21 +02:00
• ea70170d2b Merge pull request '[TASK] improve style searchable table' (#365) from js-table into main philipp 2024-04-14 18:19:22 +02:00
• 36af52bf7e Merge pull request 'js-table' (#364) from js-table into staging marie 2024-04-14 17:56:43 +02:00
• 0b6461eeb5 [TASK] improve style searchable table Marie Birner 2024-04-14 17:43:18 +02:00
• b0c936cc34 Merge pull request 'have test users only @ staging' (#363) from staging into main philipp 2024-04-14 17:00:53 +02:00
• d51174e8fd have test users only @ staging philipp 2024-04-14 16:59:17 +02:00
• e2a30dad52 Merge pull request 'staging' (#360) from staging into main philipp 2024-04-13 09:52:24 +02:00
• 74d3957cf8 dont show external boat philipp 2024-04-13 09:44:22 +02:00
• cfc35fbec6 only show non-placed boats in boathouse list philipp 2024-04-13 09:42:12 +02:00
• b1d3f8ddc9 Merge pull request 'allow html in notifications' (#359) from staging into main philipp 2024-04-12 11:33:26 +02:00
• 3b04b39d66 allow html in notifications philipp 2024-04-12 11:32:21 +02:00
• cdcb07a3f7 Merge pull request 'update deps' (#356) from staging into main philipp 2024-04-09 11:25:01 +02:00
• 19523acc67 update deps philipp 2024-04-09 11:24:38 +02:00
• faa8e6a13b Merge pull request 'fix ci' (#355) from staging into main philipp 2024-04-09 08:08:11 +02:00
• 0fed206df6 fix ci philipp 2024-04-09 08:07:56 +02:00
• 7660953e6b Merge pull request 'don't clutter logs' (#354) from staging into main philipp 2024-04-09 07:30:40 +02:00
• 4a5d9fa65b don't clutter logs philipp 2024-04-09 07:30:05 +02:00
• 83c0285204 Merge pull request 'staging' (#353) from staging into main philipp 2024-04-08 23:22:24 +02:00
• 3823d959e8 add stats from nginx logs philipp 2024-04-08 23:21:35 +02:00
• 6c302712d4 add stats from nginx logs philipp 2024-04-08 23:20:33 +02:00
• f93677b420 add stats from nginx logs philipp 2024-04-08 23:19:59 +02:00
• 23cd62820c Merge pull request 'only show notifications from last 2 weeks' (#352) from staging into main philipp 2024-04-08 20:25:37 +02:00
• 39d410b050 only show notifications from last 2 weeks philipp 2024-04-08 20:25:13 +02:00
• 61c67d78da Merge pull request 'allow admin to send notifications' (#351) from staging into main philipp 2024-04-08 19:36:35 +02:00
• 64d32e2688 allow admin to send notifications philipp 2024-04-08 19:35:31 +02:00
• 1aba6948ee Merge pull request 'only allow people with 'donau linz' role to be in logbook' (#350) from staging into main philipp 2024-04-08 19:05:29 +02:00
• 3b9103e9aa fix membership application error philipp 2024-04-08 19:04:57 +02:00
• db3158d4e7 only allow people with 'donau linz' role to be in logbook philipp 2024-04-07 23:17:06 +02:00
• 08a970853a Merge pull request 'better text for boat reservation' (#349) from staging into main philipp 2024-04-07 22:13:32 +02:00
• 7cbfafa5c5 better text for boat reservation philipp 2024-04-07 22:12:56 +02:00
• c64f392fe7 Merge pull request 'improve header of list' (#348) from staging into main philipp 2024-04-07 20:12:22 +02:00
• 4fef4ca2c6 improve header of list philipp 2024-04-07 20:11:41 +02:00
• 268c2018ae Merge pull request 'allow to search by nickname' (#347) from staging into main philipp 2024-04-07 15:31:07 +02:00
• b7e8e1fa37 keep defaults philipp 2024-04-07 15:30:52 +02:00