Ivymaster 829d50ef0a WIP: Conflicts resolved

2026-07-09 15:37:21 +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

- added room suggestion priority

2026-06-15 11:47:36 +02:00

controllers

WIP: Conflicts resolved

2026-07-09 15:37:21 +02:00

core

Merge branch 'master' into feature-68298/Tempus_Grundstruktur-tests

2026-06-08 16:56:42 +02:00

extensions

fix file permissions erroneously commited as a21a292da6

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

helpers

add resources conflict checker and extend tempus tests with it

2026-06-19 11:41:56 +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

WIP: Conflicts resolved

2026-07-09 15:37:21 +02:00

logs

fix file permissions erroneously commited as a21a292da6

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

models

Conflict resolved

2026-07-09 10:50:16 +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

add resources conflict checker and extend tempus tests with it

2026-06-19 11:41: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