ma0048
855ec94445
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# public/css/Cis4/CoreCalendarEvents.css
# public/js/components/Calendar/Base.js
# public/js/components/Calendar/Base/Grid.js
# public/js/components/Calendar/Base/Header.js
# public/js/components/Calendar/Base/Header/Datepicker.js
# public/js/components/Calendar/Mode/Week.js
# system/phrasesupdate.php
# system/seeders/015_kalender.sql
# tests/cypress/.env.example
2026-10-15 15:07:52 +02:00
ma0048
3dec37f171
Make reservation participants editable
...
Shared modal components (time, room, collision, tags, participants)
Jump to collisions
Fix: semester 0 for Lehrverband groups
2026-10-14 14:51:43 +02:00
Ivymaster
8a2d7f9ae4
BUG: Added conflict checking and max daily limit ofr lecturere and student month view
2026-10-14 10:30:49 +02:00
Ivymaster
8b4a67ed60
BUG: Minor revert
2026-10-14 10:05:12 +02:00
Ivymaster
d70a5cc731
Conflicts resolved
2026-10-13 11:03:27 +02:00
Harald Bamberger
1f570f8495
Merge branch 'master' into cis40_2026-09_ma_rc
2026-10-06 14:19:18 +02:00
ma0048
83d8884df3
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# application/models/education/Lehreinheit_model.php
2026-10-06 12:57:38 +02:00
ma0048
6ae321280e
- Listenansicht hoehe der Tabelle auf 100%
...
- Listenansicht "status" Delete entfernt, Button gelassen
- Tags ohne Dialog & Popaus aus dem Kontextmenue entfernt
- Einstellung Prioraum verwenden Raumauswahl anzeigen als Dropdown
- Sortierung der Raeume im Event
- Reservierung anzeigen wenn STG Filter gesetzt ist
- Course Picker kuerzen von Events erst nach Confirm
- Fehlende Phrasen hinzugefuegt
2026-10-06 12:53:40 +02:00
Harald Bamberger
efc8fa1eeb
Merge branch 'master' into feature-83444/lvverwaltung_suche_nach_le_und_lv_inkl_router
2026-10-06 10:27:46 +02:00
ma0048
07f258248b
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# system/dbupdate_3.4.php
2026-10-01 14:02:32 +02:00
ma0048
70ea307f88
fixed qry fuer freie raeume
2026-10-01 12:52:39 +02:00
ma0048
89fb90aef3
Added into ListView:
...
- Raumverschiebung
- Sichtbarkeitsstatus Änderung
- Tags hinzufügen/bearbeiten/löschen
ModalContent:
- Mailversandmöglichkeit
- Letzte Änderung der Zeitwünsche
- Anzahl Studierende
- Kollisionsinformation Details
- Tags des Eintrags anzeigen
- Anmerkungen zum LV-Teil
- Voller Name des Lehrenden
- Raumoptimierungs
- Sprung zur LV-Verwaltung (derzeit deaktiviert)
- Sprung zur Lehrveranstaltungsadminsitration (Vilesci)
- Lektor & Raum hinzufügen zum Filter
2026-09-29 11:12:41 +02:00
ma0048
e369a8c03f
LV-Verwaltung:
...
- Semester unter Orgform im Verbandsbaum
- Kombinierte LV/LE-Suche
- Semester/Orgform/Lehrform in Suchergebnissen
2026-09-28 08:42:37 +02:00
adisposkofh
43b849e787
merged master into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-22 13:44:49 +02:00
Harald Bamberger
50951dfdcf
anrechnungen: add pdf file extension to content disposition filename
2026-09-22 13:00:28 +02:00
adisposkofh
fc89a25d3a
merged feature-78293/news into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-16 16:31:56 +02:00
adisposkofh
09f18d9039
merged cis40_2026-05_ma_rc_routerlink_ma0080 into
2026-09-15 17:03:03 +02:00
ma0048
2ffaf36270
suche fuer lehreinheiten und lehrveranstaltungen in der lvverwaltung
2026-09-15 15:46:48 +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
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
6ea1d4610d
Conflicts resolved
2026-09-08 10:20:52 +02:00
Ivymaster
63af8efb44
Conflict resolved
2026-09-07 18:00:00 +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
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
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
Ivymaster
7275d6e897
Minor mods
2026-08-31 15:49:05 +02:00
ma0048
fb36b2a548
- merged master
...
- updaed Verbandsbaum to work with the new version
2026-08-31 14:58:27 +02:00
Ivymaster
349a0641cd
BUG: Fix for non active news display
2026-08-31 13:54:35 +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
4cbf37d727
- ueberpruefung der berechtigung auf den studiengang von der lv beim verschieben/hinzufuegen/loeschen der lehreinheit
2026-08-27 08:07:39 +02:00
Ivymaster
a0ea54d0c0
Fixed bugs found during testing
2026-08-26 17:08:53 +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
Ivymaster
6f3c0fb174
WIP
2026-08-25 17:22:44 +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
Ivymaster
708ffac47e
WIP
2026-08-20 17:05:38 +02:00
Harald Bamberger
75d2cabdbe
bugfix lv-plan
2026-08-20 15:10:26 +02:00
Harald Bamberger
cabda4cc35
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
2026-08-20 08:13:30 +02:00
ma0048