Ivymaster 7dd56283c2 Conflicts resolved

2026-10-13 14:40:05 +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

Merge branch 'master' into feature-68298/Tempus_Grundstruktur

2026-10-06 12:57:38 +02:00

controllers

Conflicts resolved

2026-10-13 14:40:05 +02:00

core

Implemented custom table for kalender notiz, and added postgres triffer function for removing resources and stale notes

2026-09-11 14:27:17 +02:00

extensions

fix file permissions erroneously commited as a21a292da6

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

helpers

Included cherrypicked commits from lv plan range branch

2026-09-09 15:13:16 +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-10-13 14:40:05 +02:00

logs

fix file permissions erroneously commited as a21a292da6

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

models

Merge branch 'master' into feature-68298/Tempus_Grundstruktur

2026-10-06 12:57:38 +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-10-13 14:40:05 +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