 Ivymaster
|
2dfa42d5d8
|
BUG: Implement kalenderNotiz in kalenderLib
|
2026-09-18 11:53:52 +02:00 |
|
|
Ivymaster
|
3acf7da82c
|
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-78281/tempus_mehrwochenansicht_new_with_virtual_scroll
|
2026-09-18 11:29:40 +02:00 |
|
|
Ivymaster
|
bf050c9297
|
Dropped calender group id column from notizzuordnung and update migrateKalender commands
|
2026-09-17 11:02:35 +02:00 |
|
|
Ivymaster
|
8bac1c1ebb
|
WIP: Special view for page printing
|
2026-09-15 14:23:15 +02:00 |
|
|
Ivymaster
|
3ec56f492f
|
Removed unused joins from collistion checker
|
2026-09-15 11:17:50 +02:00 |
|
|
Ivymaster
|
bb6832a4e9
|
Reverted collision checker changes and removed unnecearry joins
|
2026-09-15 10:47:30 +02:00 |
|
|
Ivymaster
|
c28ad0e782
|
WIP
|
2026-09-14 19:58:52 +02:00 |
|
|
Ivymaster
|
7e2fb12c7a
|
BUG: Removed unwanted limit on kalender events returned
|
2026-09-14 16:28:59 +02:00 |
|
|
Ivymaster
|
c0e2b8f25d
|
Merge branch 'feature-78281/tempus_mehrwochenansicht_new' into feature-78281/tempus_mehrwochenansicht_new_with_virtual_scroll
|
2026-09-14 16:11:11 +02:00 |
|
|
Ivymaster
|
9e65b6788d
|
BUG: Fix issues with grid layout from big conflicts
|
2026-09-14 16:09:27 +02:00 |
|
|
Ivymaster
|
b10eba44ca
|
Conflits resolved
|
2026-09-14 14:38:17 +02:00 |
|
|
Ivymaster
|
7be64fe3cd
|
WIP
|
2026-09-14 13:54:11 +02:00 |
|
|
Ivymaster
|
6d216945b7
|
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-78281/tempus_mehrwochenansicht_new
|
2026-09-14 11:09:02 +02:00 |
|
|
Ivymaster
|
e1af778d8f
|
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 |
|
|
Ivymaster
|
26b779e864
|
Conflicts resolved
|
2026-09-10 14:21:20 +02:00 |
|
|
ma0048
|
606c5143de
|
fix: deleting calendar events that have a location but no room
|
2026-09-10 13:15:00 +02:00 |
|
|
Andreas Österreicher
|
0b1e2ef919
|
Merge branch 'feature-78220/titel-tals-tag-migrieren' into feature-68298/Tempus_Grundstruktur
|
2026-09-10 12:59:27 +02:00 |
|
|
Ivymaster
|
5dc314febd
|
Included cherrypicked commits from lv plan range branch
|
2026-09-09 15:13:16 +02:00 |
|
|
Ivymaster
|
21c8bbbf90
|
Added check before droping all imported kalender events
|
2026-09-09 14:21:17 +02:00 |
|
|
Ivymaster
|
3dd46fa997
|
Minor mod
|
2026-09-09 14:05:57 +02:00 |
|
|
Ivymaster
|
45b6c190b6
|
Conlflicts resolved
|
2026-09-09 13:21:17 +02:00 |
|
|
Ivymaster
|
9f4ca01068
|
BUG: Fixed issue with refreshing and importing kalender events
|
2026-09-09 09:34:15 +02:00 |
|
|
Ivymaster
|
6ea1d4610d
|
Conflicts resolved
|
2026-09-08 10:20:52 +02:00 |
|
|
Ivymaster
|
63af8efb44
|
Conflict resolved
|
2026-09-07 18:00:00 +02:00 |
|
|
Ivymaster
|
260ede9d2f
|
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-78220/titel-tals-tag-migrieren
|
2026-09-07 17:51:23 +02:00 |
|
|
Ivymaster
|
175b077d87
|
Added mod
|
2026-09-07 17:50:09 +02:00 |
|
|
Ivymaster
|
02ff8d0e3c
|
Conflicts resolved
|
2026-09-02 15:01:56 +02:00 |
|
|
ma0048
|
90f62a7a9e
|
- merged master
- added raumvorschlag slots
|
2026-09-02 10:54:36 +02:00 |
|
|
Ivymaster
|
1bbe4368bb
|
First cherry pick of modifing event loading
|
2026-09-01 17:19:20 +02:00 |
|
|
Ivymaster
|
fd6d4095b9
|
Conflicts resolved
|
2026-09-01 13:22:46 +02:00 |
|
|
Ivymaster
|
669e03b915
|
Conflicts resolved
|
2026-09-01 13:19:17 +02:00 |
|
|
ma0048
|
eeb49e1967
|
Merge remote-tracking branch 'origin/feature-78287/tempus_raumzuordnung' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/libraries/KalenderLib.php
# application/libraries/RaumvorschlagLib.php
|
2026-09-01 13:08:38 +02:00 |
|
|
ma0048
|
1d61652b67
|
Merge remote-tracking branch 'origin/feature-78211/tempus_kollisionscheck_auf_lehreinheit_id_umbauen_' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/libraries/KalenderLib.php
|
2026-09-01 12:59:22 +02:00 |
|
|
ma0048
|
8a448fde3c
|
Merge remote-tracking branch 'origin/feature-78288/tempus_usability' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# public/css/components/horizontalsplit.css
# public/js/components/Tempus/Filters/searchbarOptions.js
|
2026-09-01 12:48:07 +02:00 |
|
|
ma0048
|
1361c3fc00
|
Merge remote-tracking branch 'origin/feature-78286/tempus_berechtigungen' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/controllers/api/frontend/v1/tempus/Coursepicker.php
# application/libraries/KalenderLib.php
|
2026-09-01 12:42:16 +02:00 |
|
|
ma0048
|
d727012806
|
Merge remote-tracking branch 'origin/feature-78285/tempus_stundenraster_ausschalten_nur_mit_eigener_berechtigung' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# system/dbupdate_3.4.php
|
2026-09-01 12:32:38 +02:00 |
|
|
ma0048
|
b91ba9fdbb
|
Merge remote-tracking branch 'origin/feature-78324/tempus_coursepicker_lektor' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/controllers/api/frontend/v1/tempus/Coursepicker.php
# public/js/components/Tempus/Coursepicker.js
|
2026-09-01 12:28:32 +02:00 |
|
|
ma0048
|
357a51bdcb
|
Merge remote-tracking branch 'origin/feature-78317/tempus_delete_status' into feature-68298/Tempus_Grundstruktur
|
2026-09-01 12:21:53 +02:00 |
|
|
ma0048
|
61ef27e5eb
|
Merge branch 'feature-77949/tempus_synchronisation' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/libraries/KalenderLib.php
# system/dbupdate_3.4.php
|
2026-09-01 12:20:12 +02:00 |
|
|
Ivymaster
|
61d7268f90
|
Conflicts resolved
|
2026-09-01 11:52:25 +02:00 |
|
|
ma0048
|
fb36b2a548
|
- merged master
- updaed Verbandsbaum to work with the new version
|
2026-08-31 14:58:27 +02:00 |
|
|
ma0048
|
51886960bb
|
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/controllers/api/frontend/v1/lv/StgTree.php
# public/js/components/Stv/Studentenverwaltung/Verband.js
# system/dbupdate_3.4.php
# tests/cypress/.gitignore
|
2026-08-31 12:49:28 +02:00 |
|
|
ma0048
|
98be0b43b7
|
- permissions geandert
|
2026-08-27 08:08:34 +02:00 |
|
|
ma0048
|
4cbf37d727
|
- ueberpruefung der berechtigung auf den studiengang von der lv beim verschieben/hinzufuegen/loeschen der lehreinheit
|
2026-08-27 08:07:39 +02:00 |
|
|
ma0048
|
623e8007b0
|
- sichtbarkeitsstatus hinzugefuegt
- tage ausblendbar
- lektor zur lvverwaltung verlinkt
- vertical splitter hinzugefuegt
- anzahl der einheiten hinzugefuegt
|
2026-08-26 09:01:47 +02:00 |
|
|
Harald Bamberger
|
6d641bbd06
|
pass in uid by reference
|
2026-08-24 13:56:55 +02:00 |
|
|
Harald Bamberger
|
f84d12277d
|
remove debug code
|
2026-08-24 07:31:47 +02:00 |
|
|
Harald Bamberger
|
9bf5bc2ad9
|
more generic bugfix, to use studentlehrverband only with date_range for the same studiensemester_kurzbz
|
2026-08-24 07:26:12 +02:00 |
|
|
Harald Bamberger
|
75d2cabdbe
|
bugfix lv-plan
|
2026-08-20 15:10:26 +02:00 |
|
|
Harald Bamberger
|
7f3b4100ab
|
Merge branch 'master' into feature-78257/StudVW_Und_Tags_Finetuning
|
2026-08-19 15:07:07 +02:00 |
|