Commit Graph - rowt

Ruderverein-Donau-Linz/rowt

Fork 1

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

816257d4be Merge pull request 'remove notes from users (switched to activity)' (#1002) from remove-notes into main philipp 2025-05-09 08:57:45 +02:00
71087af0df Merge pull request 'remove-notes' (#1001) from remove-notes into staging philipp 2025-05-09 08:45:15 +02:00
23399b7757 remove notes from users (switched to activity) Philipp Hofer 2025-05-09 08:44:17 +02:00
0c5812f725 Merge pull request 'show all activities for admin; Fixes #984' (#1000) from show-all-activities into main philipp 2025-05-09 08:32:33 +02:00
6efcaaccf9 Merge pull request 'show-all-activities' (#999) from show-all-activities into staging philipp 2025-05-09 08:32:14 +02:00
d88a35bb82 show all activities for admin; Fixes #984 Philipp Hofer 2025-05-09 08:30:09 +02:00
52abcbb3fb Merge pull request 'show proper text for all who have acheived diamond equatorprice' (#998) from fix-diamond-text into main philipp 2025-05-07 13:44:47 +02:00
60578dfaba Merge pull request 'fix-diamond-text' (#997) from fix-diamond-text into staging philipp 2025-05-07 13:44:43 +02:00
29777cdc36 show proper text for all who have acheived diamond equatorprice Philipp Hofer 2025-05-07 13:43:57 +02:00
22b9a2e324 Merge pull request '[TASK] add search bar and improve ux' (#996) from improve-role-view into main philipp 2025-05-07 13:06:39 +02:00
addf0f437b Merge pull request 'improve-role-view' (#995) from improve-role-view into staging philipp 2025-05-07 13:06:33 +02:00
a97d515f03 lint Philipp Hofer 2025-05-07 13:06:02 +02:00
72fc3ed91e [TASK] add search bar and improve ux Marie Birner 2025-05-07 11:52:58 +02:00
b079eafc3d Merge pull request 'update deps' (#994) from upd into main philipp 2025-05-06 22:51:56 +02:00
51df7f2d1e Merge pull request 'upd' (#993) from upd into staging philipp 2025-05-06 22:51:06 +02:00
6e1bfe8635 update deps Philipp Hofer 2025-05-06 22:49:51 +02:00
ce28f93d65 Merge pull request 'single-user-edit-page' (#992) from single-user-edit-page into main philipp 2025-05-06 13:43:23 +02:00
78faf1b0db Merge pull request 'single-user-edit-page' (#991) from single-user-edit-page into staging philipp 2025-05-06 13:40:59 +02:00
bf3a4c686a Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page Philipp Hofer 2025-05-06 13:40:39 +02:00
5fb9e0fbba format Philipp Hofer 2025-05-06 13:40:33 +02:00
e3fc756b3f Merge pull request 'single-user-edit-page' (#990) from single-user-edit-page into staging philipp 2025-05-06 10:14:55 +02:00
f58e7d1307 Merge commit '374fed9e3bdcee30a3f8315d1f0c392204a885df' into single-user-edit-page Marie Birner 2025-05-06 09:57:02 +02:00
374fed9e3b fix tests by clicking on boat name instead of cox Philipp Hofer 2025-05-06 08:50:45 +02:00
b9f2382cba [BUGFIX] buttons mobile margin Marie Birner 2025-05-06 07:45:32 +02:00
aab3a15488 [BUGFIX] back link margin bottom mobile Marie Birner 2025-05-06 07:44:12 +02:00
83b93fba09 Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page Philipp Hofer 2025-05-05 22:24:32 +02:00
3b5ff70d1d don't clutter acitvities toooooo much Philipp Hofer 2025-05-05 22:23:28 +02:00
2af9ac20b1 Merge pull request '[TASK] add icons to add new user and improve ui in setting a fixed height in activity log' (#989) from improve-user-view into single-user-edit-page philipp 2025-05-05 22:16:11 +02:00
5331ac71fa [TASK] add icons to add new user and improve ui in setting a fixed height in activity log Marie Birner 2025-05-05 22:12:19 +02:00
6098aedb74 fix tests? Philipp Hofer 2025-05-05 22:11:56 +02:00
8500ba826f [TASK] try to include boat and shipmaster in update popup improve-logbook-entry-update Marie Birner 2025-05-05 21:41:52 +02:00
af2e7cb557 Merge commit '17513bbc386e849962157517d9a4496870b1a064' into single-user-edit-page Marie Birner 2025-05-05 21:14:41 +02:00
81b99ef414 [TASK] edit form on logbook fixes #635 Marie Birner 2025-05-05 21:14:23 +02:00
17513bbc38 give frontend stuff to be able to update logbook entriese Philipp Hofer 2025-05-05 21:11:41 +02:00
c1cecf3b20 don't panic on 'external cox' Philipp Hofer 2025-05-05 20:46:41 +02:00
8e40e563c6 even less clutter! Philipp Hofer 2025-05-05 20:44:00 +02:00
bb78441cc4 Merge branch 'single-user-edit-page' of https://git.hofer.link/Ruderverein-Donau-Linz/rowt into single-user-edit-page Marie Birner 2025-05-05 20:37:45 +02:00
abcf46281b [TASK] style detail view user Marie Birner 2025-05-05 20:37:29 +02:00
c460494be8 Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page Philipp Hofer 2025-05-05 20:37:20 +02:00
7083d27644 Merge pull request 'single-user-edit-page' (#986) from single-user-edit-page into staging philipp 2025-05-05 20:37:12 +02:00
e5560ba536 don't clutter acitvities too much Philipp Hofer 2025-05-05 20:37:12 +02:00
b7094bff06 Merge branch 'single-user-edit-page' of https://git.hofer.link/Ruderverein-Donau-Linz/rowt into single-user-edit-page Marie Birner 2025-05-05 20:21:11 +02:00
6b8b4ba1d2 [TASK] style new user action in list view Marie Birner 2025-05-05 20:20:52 +02:00
03f76b1ae5 Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page Philipp Hofer 2025-05-05 20:01:48 +02:00
1864ea260c allow to edit roles Philipp Hofer 2025-05-05 20:01:32 +02:00
35a5a55140 [TASK] change background color dark view Marie Birner 2025-05-05 19:44:11 +02:00
9a4dcc0b9d create activity for 'user deleted'; Fixes #985 Philipp Hofer 2025-05-05 18:23:31 +02:00
8277ef6af8 Merge pull request 'allow to create users' (#978) from single-user-edit-page into staging philipp 2025-05-05 12:05:47 +02:00
43074b3bd7 fix err if scheckbuch has already paid Philipp Hofer 2025-05-05 11:49:26 +02:00
933e407c64 update prod db :-) Philipp Hofer 2025-05-05 11:41:32 +02:00
d9e86bf43b allow to create users Philipp Hofer 2025-05-05 11:35:38 +02:00
67d5df9c18 Merge pull request 'Fill acitivites from various activities; Fixes #972' (#977) from single-user-edit-page into staging philipp 2025-05-04 19:05:38 +02:00
ebbb4fe3da don't create activity, e.g. for paid-changes, as this is already logged Philipp Hofer 2025-05-04 18:48:14 +02:00
9178476013 improve string Philipp Hofer 2025-05-04 18:41:50 +02:00
e853381bd7 Fill acitivites from various activities; Fixes #972 Philipp Hofer 2025-05-04 18:38:14 +02:00
3ffc44a5a2 Merge pull request 'single-user-edit-page' (#975) from single-user-edit-page into staging philipp 2025-05-04 10:48:41 +02:00
8777ccb341 format Philipp Hofer 2025-05-04 10:31:36 +02:00
6362fed909 Be able to update financial and skill; Fixes #974 Philipp Hofer 2025-05-04 10:31:15 +02:00
bd2686fa9c Merge pull request 'add notes' (#973) from single-user-edit-page into staging philipp 2025-05-03 21:37:31 +02:00
905178e60d add explanation text + reformat Philipp Hofer 2025-05-03 21:22:35 +02:00
cd52e76b61 remove already replaced part Philipp Hofer 2025-05-03 21:17:17 +02:00
151c97aabc add notes Philipp Hofer 2025-05-03 21:12:04 +02:00
495ee666cd Merge pull request 'single-user-edit-page' (#971) from single-user-edit-page into staging philipp 2025-05-03 19:20:17 +02:00
e360c4f06b start with activity + fix tests Philipp Hofer 2025-05-03 19:04:13 +02:00
d50501b362 delete large user-update-function 🎉 Fixes #958 Philipp Hofer 2025-05-03 18:31:14 +02:00
e6895c8cf1 allow final usertype changes; Fixes #954 Philipp Hofer 2025-05-03 18:26:19 +02:00
7bd863ddf1 [TASK] add schnupper to scheckbuch button Marie Birner 2025-05-03 17:44:27 +02:00
afc32cc41e allow to change from schnupperant to scheckbuch Philipp Hofer 2025-05-03 17:39:03 +02:00
9dfcb4e2c4 [TASK] change text not logged in yet Marie Birner 2025-05-03 17:23:40 +02:00
149b6afbf5 [TASK] adapt action in user detail view schnupperant or scheckbuch Marie Birner 2025-05-03 17:19:51 +02:00
f9a53a703b Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page Philipp Hofer 2025-05-03 17:14:10 +02:00
c8be0c2c22 allow changing from schnupperant Philipp Hofer 2025-05-03 17:14:03 +02:00
6c8667973d [TASK] rm cursor pointer and rename mitgliedstyp to mitgliedsstatus Marie Birner 2025-05-03 16:57:54 +02:00
07f7dbca12 [BUGFIX] foerdend to foerdernd in html Marie Birner 2025-05-03 16:50:22 +02:00
3f29400831 Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page Philipp Hofer 2025-05-03 16:46:45 +02:00
46981c3311 allow to change type between members Philipp Hofer 2025-05-03 16:46:40 +02:00
b08fcdc05b [TASK] change list view user Marie Birner 2025-05-03 16:46:30 +02:00
a60606bbe4 [TASK] add icons to back button and download button Marie Birner 2025-05-03 16:26:43 +02:00
540031cab4 [TASK] add back button Marie Birner 2025-05-03 16:20:24 +02:00
a93c420630 [TASK] edit membership type button and dialog Marie Birner 2025-05-03 16:13:57 +02:00
8dc55a7aad format Philipp Hofer 2025-05-03 15:54:52 +02:00
5b78afff63 [TASK] refactor roles and move elements around Marie Birner 2025-05-03 15:54:10 +02:00
25c3a28c7d Merge branch 'single-user-edit-page' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into single-user-edit-page Philipp Hofer 2025-05-03 15:09:23 +02:00
2bb42c3f6a allow moving scheckbuch -> unterstützend + fördernd Philipp Hofer 2025-05-03 15:09:15 +02:00
d7dec5da29 [TASK] only allowed users change role from scheckbuch to mitglied Marie Birner 2025-05-03 14:45:57 +02:00
ffe1745b65 [TASK] add opacity disabled select Marie Birner 2025-05-03 14:42:43 +02:00
5296b6a6c1 Merge pull request 'single-user-edit-page' (#970) from single-user-edit-page into staging philipp 2025-05-03 13:46:39 +02:00
f374016207 update users Philipp Hofer 2025-05-03 13:14:47 +02:00
6d329eb980 format Philipp Hofer 2025-05-03 12:58:04 +02:00
cfd3c6200f move block Philipp Hofer 2025-05-03 12:57:49 +02:00
4d95282e58 Merge commit '9aab07422dc1f6af7fb3836704a565e109b01ff3' into single-user-edit-page Marie Birner 2025-05-03 12:45:04 +02:00
540c122248 [TASK] refactor ui user detail page Marie Birner 2025-05-03 12:44:46 +02:00
9aab07422d allow moving scheckbuch -> regular Philipp Hofer 2025-05-03 12:27:02 +02:00
49e657ab54 Merge pull request 'single-user-edit-page' (#968) from single-user-edit-page into staging philipp 2025-05-02 18:16:53 +02:00
c47b1988b2 [TASK] add input group element with interaction Marie Birner 2025-05-02 17:24:40 +02:00
a73bbf059f format + reorder blocks Philipp Hofer 2025-05-02 15:15:02 +02:00
1f17a10133 clearer error msg Philipp Hofer 2025-05-01 20:15:39 +02:00
73c79fb008 progress Philipp Hofer 2025-05-01 20:08:05 +02:00
c2b57583cf fix error when no fee is set Philipp Hofer 2025-05-01 19:14:40 +02:00
25bbaca0d3 Merge pull request 'show payment status in user view; Fixes #965' (#967) from single-user-edit-page into staging philipp 2025-04-30 23:32:36 +02:00