 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
|
873959f1a0
|
add missing phrases and fix minor bugs
|
2026-10-14 12:40:10 +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
|
b2f3b5a3bc
|
Merge branch 'bugfix-84655-bootstrap-modal-dispose-error'
|
2026-10-13 18:40:47 +02:00 |
|
|
adisposkofh
|
864b56e62c
|
resolved error with modal dispose; removed dispose, issue with bubbling hide events in nested modals
|
2026-10-13 14:19:40 +02:00 |
|
|
Harald Bamberger
|
424ed0c5bb
|
do not load Model from Extension in Core
|
2026-10-13 12:32:49 +02:00 |
|
|
Harald Bamberger
|
b0f1572576
|
Merge branch 'cis40_2026-09_ma_rc'
|
2026-10-13 11:10:32 +02:00 |
|
|
Ivymaster
|
d70a5cc731
|
Conflicts resolved
|
2026-10-13 11:03:27 +02:00 |
|
|
Ivymaster
|
fbecfb9d4d
|
BUG: fix for unpredictable spinner targeting
|
2026-10-13 10:57:02 +02:00 |
|
|
Harald Bamberger
|
03efc55c93
|
remove checked in symlink that is generated by composer
|
2026-10-13 10:37:25 +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
|
510ce22cc9
|
Merge branch 'cis40_2026-09_ma_rc_bugfix-83851-cms-content-table-formatting' into cis40_2026-09_ma_rc
|
2026-10-12 17:54:07 +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 |
|
|
Ivymaster
|
2a9e694fb9
|
BUG: Fix for emphasize of kalender events
|
2026-10-12 15:14:44 +02:00 |
|
|
Ivymaster
|
e1d44a3337
|
Add removal of calender event visual position update on dragDrop and resize
|
2026-10-12 14:44:09 +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 |
|
|
adisposkofh
|
73d22e14e5
|
cms content tabulator formatting fix
|
2026-10-12 12:39:43 +02:00 |
|
|
Harald Bamberger
|
bca2884aa2
|
CisMenuApp fetch Authinfo, Cis search use isMitarbeiter flag to conditinally render Zeitsperren Button in search result
|
2026-10-12 11:37:45 +02:00 |
|
|
Harald Bamberger
|
63d0bfc69b
|
Merge branch 'cis40_2026-09_ma_rc_bugfix-84008-lvplan-with-lvid-shows-reservations' into cis40_2026-09_ma_rc
|
2026-10-12 10:30:29 +02:00 |
|
|
Harald Bamberger
|
ab05f32fde
|
Merge branch 'cis40_2026-09_ma_rc' into cis40_2026-09_ma_rc_bugfix-84008-lvplan-with-lvid-shows-reservations
|
2026-10-12 10:21:03 +02:00 |
|
|
Harald Bamberger
|
62e704a6cf
|
add berechtigung dashboard/widget_studstatus_ma, adapt dbupdate for widget studstatus to use new permission and use dashboard_kurzbz and widget_kurzbz to link widget to CIS dashboard
|
2026-10-12 09:37:37 +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
|
cdd36f61b1
|
in lv plan not fetching reservations if lv id query param is present
|
2026-10-09 12:10:32 +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 |
|
|
adisposkofh
|
9e2cc68531
|
fixed prop type syntax
|
2026-10-07 17:09:22 +02:00 |
|
|
adisposkofh
|
45647f0cec
|
showing average grades in mylv table (already implemented in cards view)
|
2026-10-07 11:39:22 +02:00 |
|
|
adisposkofh
|
50a518ea7a
|
additional mylv localizations
|
2026-10-07 10:53:46 +02:00 |
|
|
adisposkofh
|
2b44b421dc
|
minor phrases fix
|
2026-10-07 10:16:26 +02:00 |
|
|
adisposkofh
|
70a93cc093
|
minor phrases fix
|
2026-10-07 10:15:57 +02:00 |
|
|
Andreas Österreicher
|
0c4d102850
|
Merge branch 'bug-83698/StudVW_Projektarbeit_Kontaktdaten'
3.4_pre_cis40_2026_09_ma_rc
|
2026-10-07 09:11:42 +02:00 |
|
|
Andreas Österreicher
|
2e15f2c5ab
|
Edit Dialog von Kontaktdaten bei Projektbetreuer die Mitarbeiter sind wird nicht angezeigt
|
2026-10-07 09:10:51 +02:00 |
|
|
adisposkofh
|
4768fbda15
|
saving last selected myLv mode; hiding modes for students
|
2026-10-06 17:13: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 |
|
|
Harald Bamberger
|
784e5693b4
|
compat component add/remove css class via lifecycle hooks to apply compat specific rules
|
2026-10-06 15:22:16 +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 |
|
|
Harald Bamberger
|
67a33f2ceb
|
revert dashboard item overscroll-behavior to auto, so scrolling the page is not only possible on the page borders
|
2026-10-06 14:15:46 +02:00 |
|
|
adisposkofh
|
4549c92d50
|
myLV lehreinheiten table formatting
|
2026-10-06 13:48:23 +02:00 |
|
|
ma0048
|
a483269a1a
|
lvverwaltung & vilesci links eingblendet
|
2026-10-06 13:32:07 +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
|
fb341154b5
|
lvverwaltung link in coursepicker eingblendet
|
2026-10-06 12:54:13 +02:00 |
|