Ivymaster 6ea1d4610d Conflicts resolved

2026-09-08 10:20:52 +02:00

..

cache

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

components

move dropdown profileUpdateStates to FilterComponent, delete not needed code

2025-10-22 14:25:43 +02:00

config

Conflicts resolved

2026-09-01 11:52:25 +02:00

controllers

Conflicts resolved

2026-09-02 15:01:56 +02:00

core

Conflicts resolved

2026-09-01 11:52:25 +02:00

extensions

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

helpers

Merge branch 'master' into feature-68298/Tempus_Grundstruktur

2026-08-31 12:49:28 +02:00

hooks

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

language

add validation "is_in_db"

2025-09-02 16:04:02 +02:00

libraries

Conflicts resolved

2026-09-08 10:20:52 +02:00

logs

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

models

Merge branch 'feature-77949/tempus_synchronisation' into feature-68298/Tempus_Grundstruktur

2026-09-01 12:20:12 +02:00

third_party

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

tmp

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00

views

Conflicts resolved

2026-09-02 15:01:56 +02:00

widgets

TableWidget bug: the bootstrapVersion was provided with the tableUniqueId, not needed

2025-03-03 13:44:40 +01:00

index.html

fix file permissions erroneously commited as a21a292da6

2024-10-17 15:34:00 +02:00