Ivymaster
0a545c47fc
Conflicts resolved
2026-10-22 11:45:54 +02:00
ma0048
47bf0f3793
fixed minor bugs
...
added phrases
2026-10-22 11:00:55 +02:00
Ivymaster
3a2915e21c
Reverted collisionChecker runAll to previous version
2026-10-22 09:19:36 +02:00
Ivymaster
ff26adaca3
Removed observers based grid update, from range view, with watcher update
2026-10-21 22:31:52 +02:00
Ivymaster
ed3da03c75
Minor mods
2026-10-21 09:51:19 +02:00
Ivymaster
0468e8a227
Conflicts resolved
2026-10-19 11:21:22 +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
25203affb4
minor bugs
2026-10-15 16:33:16 +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
545316aea2
Merge branch 'feature-68298/Tempus_Grundstruktur' into test-83711/Tempus_Automatisierte_Tests
2026-10-15 10:56:39 +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
b1fb9624ee
WIP
2026-10-14 09:50:54 +02:00
Ivymaster
7dd56283c2
Conflicts resolved
2026-10-13 14:40:05 +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
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
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
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
b10eba44ca
Conflits resolved
2026-09-14 14:38:17 +02:00
Ivymaster
7be64fe3cd
WIP
2026-09-14 13:54:11 +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