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
ma0048
9993f3b96e
filtervar for isCollisionCheckEnabled
2026-10-14 11:27:12 +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
Harald Bamberger
424ed0c5bb
do not load Model from Extension in Core
2026-10-13 12:32:49 +02:00
Ivymaster
d70a5cc731
Conflicts resolved
2026-10-13 11:03:27 +02:00
Harald Bamberger
95c4dc2734
use Compat component for gesamtnote
2026-10-13 10:26:19 +02:00
Harald Bamberger
94c019888a
use legacy link for gesamtnote for the moment
2026-10-13 09:50:04 +02:00
Harald Bamberger
ed83b5e617
zeitsperren: add Mailphrases, mailstatus handling backend and frontend
2026-10-13 07:56:59 +02:00
Harald Bamberger
53049504a7
modify Zeitsperren API Endpoints to send sancho Mails, modify update check so that a zeitsperre does not block an update on itself when overlapping, add phrases for sancho mail subject to ci phrase system
2026-10-12 17:13:52 +02:00
Harald Bamberger
3e06740758
add permissions cis/eigene_zeitsperren and cis/andere_zeitsperren and use them for zeitsperren and zeitsperrenma applications and api endpoints
2026-10-12 14:25:31 +02:00
Harald Bamberger
2d5446bfc7
Merge branch 'feature-83700/RaumsucheStandort' into cis40_2026-09_ma_rc
2026-10-12 08:12:01 +02:00
Harald Bamberger
96a373682a
Merge branch 'master' into cis40_2026-09_ma_rc
2026-10-09 13:16:44 +02:00
adisposkofh
ebb0042881
Merge branch 'cis40_2026-05_ma_rc_83533-mylv-rework' into cis40_2026-09_ma_rc
2026-10-09 11:22:47 +02:00
adisposkofh
4e7a3b22fe
displaying wahlname (if not null) instead of vorname in betreuungen table
2026-10-09 10:04:50 +02:00
Johann Hoffmann
221d810f3f
raumsuche basic filter by reservieren & aktiv = true; added erweiterte filter and columns for m², stockwerk and gebäudeteil; added the standort category "Ohne Standort" for virtual ones;
2026-10-08 18:01:39 +02:00
Andreas Österreicher
0c4d102850
Merge branch 'bug-83698/StudVW_Projektarbeit_Kontaktdaten'
2026-10-07 09:11:42 +02:00
adisposkofh
d8959d9776
added groups to myLv lehreinheiten table
2026-10-06 17:00:28 +02:00
Harald Bamberger
27bd463109
Merge branch 'master' into cis40_2026-09_ma_rc
2026-10-06 15:34:32 +02:00
Andreas Österreicher
88b49b70e9
Fehlermeldung korrigiert beim Endupload wenn Zweitbetreuer keine E-Mail hinterlegt hat
2026-10-06 14:47:45 +02:00
Harald Bamberger
1f570f8495
Merge branch 'master' into cis40_2026-09_ma_rc
2026-10-06 14:19:18 +02:00
adisposkofh
4549c92d50
myLV lehreinheiten table formatting
2026-10-06 13:48:23 +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
Harald Bamberger
ca4043833e
Merge branch 'master' into cis40_2026-09_ma_rc
2026-10-05 18:04:32 +02:00
Harald Bamberger
643929a0c6
add cis4 class to body to make it harder for cms content style sheets to override padding, add names to calendar events renderer components, show lvmenu not only for route MyLvPlan but e.g. also in Dashboard LvPlan Widget
2026-10-05 17:56:57 +02:00
adisposkofh
a5aa4c8466
added myLv lehrenheiten table
2026-10-05 15:14:04 +02:00
Harald Bamberger
b97dec7343
Merge branch 'master' into cis40_2026-09_ma_rc
2026-10-05 13:11:02 +02:00
Harald Bamberger
4ba2869632
Merge branch 'master' into bugfix-83059_incorrect-ical-semester-parameters
2026-10-05 11:22:59 +02:00
Manuela Thamer
3034615455
fix pagelock of modals
...
prevent editing contact data of employees
2026-10-01 17:27:54 +02:00
Johann Hoffmann
9b137452d9
standort filter in raumsuche; fix the ort/standort queries so _DUMMY rooms actually get filtered out as intended
2026-10-01 17:21:55 +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
Harald Bamberger
e24a66a454
Merge branch 'master' into cis40_2026-09_ma_rc
2026-09-30 15:59:57 +02:00
Harald Bamberger
76a8e00edf
Merge branch 'master' into feature-77757/WidgetsBerechtigung
2026-09-30 15:23:08 +02:00
adisposkofh
af978e1312
implemented myLv supervisor view
2026-09-30 13:23:03 +02:00
Harald Bamberger
59c5100a86
Merge branch 'feature-83650/cis40_2026-05_ma_rc_LE_optional_4_PA_fix' into cis40_2026-09_ma_rc
2026-09-29 18:19:39 +02:00
adisposkofh
22500a96c1
Merge branch 'cis40_2026-09_ma_rc' into cis40_2026-05_ma_rc_83533-mylv-rework
2026-09-29 17:13:45 +02:00
adisposkofh
03af6bfda5
added different views (lvs, lehrenheiten, supervisor) to mylv page
2026-09-29 17:12:52 +02:00
Harald Bamberger
0fafb95bd8
Merge branch 'bugfix/cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09-news-administration' into cis40_2026-09_ma_rc
2026-09-29 14:59:34 +02:00
Harald Bamberger
9605227139
Merge branch 'master' into cis40_2026-09_ma_rc
2026-09-29 14:58:05 +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
Ivymaster
43d5068cda
Add fix for unconsistent translation options in news administration form
2026-09-28 19:01:26 +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
Johann Hoffmann
f817527ab9
fix faulty master merge conflicts; adapted getTermine & getPaAbgaben in Paabgabe_model.php; reordered created hook in ProjektabgabeUebersicht.js to start loading phrasen immediately;
2026-09-24 11:50:00 +02:00
Johann Hoffmann
754e619e30
Merge branch 'master' into feature-83650/cis40_2026-05_ma_rc_LE_optional_4_PA_fix
...
# Conflicts:
# application/models/education/Projektarbeit_model.php
# public/js/apps/Cis/Cis.js
# public/js/components/Cis/Compat.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2026-09-24 11:25:31 +02:00
adisposkofh
ab2333f708
limiting fetched columns in getUserData endpoint
2026-09-23 16:19:45 +02:00
adisposkofh
c4e79ffdf9
filtering selectable semesters in range view depending on user age
2026-09-23 16:17:45 +02:00
ma0048