Ivymaster
c27791f80d
Add mods for failing tests due to the latest master merge
2026-10-16 09:50:18 +02:00
Ivymaster
530e299007
Merge branch 'feature-68298/Tempus_Grundstruktur' into test-83711/Tempus_Automatisierte_Tests
2026-10-15 17:20:32 +02:00
Ivymaster
054d515821
WIP
2026-10-15 17:19:48 +02:00
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
Ivymaster
2b740a5a09
BUG: Fixed relationships in kalender seeders
2026-10-15 11:28:19 +02:00
Ivymaster
545316aea2
Merge branch 'feature-68298/Tempus_Grundstruktur' into test-83711/Tempus_Automatisierte_Tests
2026-10-15 10:56:39 +02:00
Ivymaster
9331a9a074
Add test replacement for publication of events
2026-10-15 09:59:34 +02:00
ma0048
873959f1a0
add missing phrases and fix minor bugs
2026-10-14 12:40:10 +02:00
Ivymaster
b1fb9624ee
WIP
2026-10-14 09:50:54 +02:00
Ivymaster
0f548d16a9
Conflicts resolved
2026-10-13 14:43:32 +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
Ivymaster
edc805a7c2
WIP
2026-10-12 10:25:30 +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
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
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
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'
2026-10-07 09:11:42 +02:00
adisposkofh
4768fbda15
saving last selected myLv mode; hiding modes for students
2026-10-06 17:13:42 +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
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
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
Andreas Österreicher
36064afbba
Fixed Testing Projektarbeit Seeds
2026-10-01 15:33:05 +02:00
ma0048
17e5d59efa
added missed phrase
2026-10-01 14:44:17 +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
Harald Bamberger
e24a66a454
Merge branch 'master' into cis40_2026-09_ma_rc
2026-09-30 15:59:57 +02:00
Harald Bamberger
272014bd78
remove odd phrases
2026-09-30 15:38:43 +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
a53c4fd623
Merge branch 'master' into cis40_2026-09_ma_rc
2026-09-30 12:24:30 +02:00
Harald Bamberger
34761db664
rename phrase
2026-09-30 10:56:30 +02:00
Harald Bamberger
b57e1984a8
Merge branch 'master' into bug-82297/ausweis-date-preview-issue
2026-09-30 10:20:28 +02:00
Harald Bamberger
9605227139
Merge branch 'master' into cis40_2026-09_ma_rc
2026-09-29 14:58:05 +02:00
Ivymaster
58c6c69770
Conflicts resolved
2026-09-29 10:34:42 +02:00
adisposkofh
1e2dbeac10
added 'no news available' message
2026-09-25 11:27:00 +02:00
adisposkofh
fb0a92a636
fhc calendar print action button on range view
2026-09-23 17:08:20 +02:00
adisposkofh
4d2a6589b4
reworked range view presets and localized label
2026-09-23 15:39:41 +02:00
adisposkofh
191a81058c
lv plan mode phrases fix
2026-09-23 15:32:07 +02:00
adisposkofh
dd25c7af75
lv plan mode phrases fix
2026-09-23 15:31:58 +02:00
adisposkofh
adce19e651
changed lv plan range view icon, added tooltips on lv plan view buttons
2026-09-23 14:40:52 +02:00
Ivymaster