 Ivymaster
|
2eef6fb620
|
Made "range mode" useable in tempus view
|
2026-10-19 16:19:21 +02:00 |
|
|
Ivymaster
|
0468e8a227
|
Conflicts resolved
|
2026-10-19 11:21:22 +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 |
|
|
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
|
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
|
2d5446bfc7
|
Merge branch 'feature-83700/RaumsucheStandort' into cis40_2026-09_ma_rc
|
2026-10-12 08:12:01 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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
|
5aa007f49c
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-10-01 12:43:17 +02:00 |
|
|
Harald Bamberger
|
f3d031ab16
|
cismenu: add cis-main-menu class to main nav, add li elements to ul, style cis-main-menu ul and li to prevent interferec with cms content styles, add draggable false to cis menu entries to improve menu scrolling especially on mobile devices
|
2026-10-01 11:48:51 +02:00 |
|
|
Harald Bamberger
|
1d838f8116
|
Merge branch 'cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09' into cis40_2026-09_ma_rc
|
2026-09-29 14:59:00 +02:00 |
|
|
Harald Bamberger
|
9605227139
|
Merge branch 'master' into cis40_2026-09_ma_rc
|
2026-09-29 14:58:05 +02:00 |
|
|
adisposkofh
|
a64219dd25
|
range lv plan print css mod
|
2026-09-29 14:50:11 +02:00 |
|
|
adisposkofh
|
e06d5fbdc1
|
minor range lv plan print fix
|
2026-09-29 13:22:48 +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 |
|
|
adisposkofh
|
d30595bbfb
|
reworked degree program contact persons collapsible
|
2026-09-29 09:59:13 +02:00 |
|
|
adisposkofh
|
eebe2d6aec
|
code formatting
|
2026-09-28 17:05:07 +02:00 |
|
|
adisposkofh
|
9ae2c91677
|
reworked degree program contact persons collapsible
|
2026-09-28 15:34:23 +02:00 |
|
|
adisposkofh
|
0279813ba9
|
sticky first column in zeitsperrenma table
|
2026-09-24 16:33:42 +02:00 |
|
|
Ivymaster
|
e3210f227b
|
BUG: Fixed issue with unuseable collapsed columns in tempus calender
|
2026-09-24 15:53:09 +02:00 |
|
|
Ivymaster
|
c9bbd4e84e
|
WIP: Multiple weeks range view
|
2026-09-24 13:54:34 +02:00 |
|
|
adisposkofh
|
eb164f5f69
|
added range view to other lv plan
|
2026-09-23 15:17:37 +02:00 |
|
|
adisposkofh
|
a4f8154662
|
merged feature-78496_lv-plan-range-view into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
|
2026-09-22 13:43:25 +02:00 |
|
|
adisposkofh
|
33d3983a97
|
fhc calendar range view print fix
|
2026-09-22 13:39:24 +02:00 |
|
|
adisposkofh
|
a9f84eda42
|
fhc calendar range view print fix
|
2026-09-22 11:36:06 +02:00 |
|
|
adisposkofh
|
3f3e94bdc9
|
reworked fhc calendar range view print css
|
2026-09-21 16:16:17 +02:00 |
|
|
adisposkofh
|
72e7b215ef
|
reworked fhc calendar range view to flip axes
|
2026-09-21 14:30:20 +02:00 |
|
|
adisposkofh
|
1357ed5d3d
|
fixed absences header styling
|
2026-09-17 15:13:02 +02:00 |
|
|
Ivymaster
|
d7a5c73233
|
Random bug fixes, minor mods and styling changes
|
2026-09-17 09:25:19 +02:00 |
|
|
adisposkofh
|
fba5953b59
|
merged features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
|
2026-09-16 14:57:23 +02:00 |
|
|
adisposkofh
|
7ea80395a8
|
merged feature-78497/Cis4StudiumStgInfoBlock into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
|
2026-09-16 14:43:10 +02:00 |
|
|
adisposkofh
|
9a45efd558
|
merged feature-78496_lv-plan-range-view into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
|
2026-09-16 13:42:03 +02:00 |
|
|
Ivymaster
|
c0e2b8f25d
|
Merge branch 'feature-78281/tempus_mehrwochenansicht_new' into feature-78281/tempus_mehrwochenansicht_new_with_virtual_scroll
|
2026-09-14 16:11:11 +02:00 |
|
|
Ivymaster
|
9e65b6788d
|
BUG: Fix issues with grid layout from big conflicts
|
2026-09-14 16:09:27 +02:00 |
|
|
Ivymaster
|
b10eba44ca
|
Conflits resolved
|
2026-09-14 14:38:17 +02:00 |
|
|
Alexei Karpenko
|
073160dde4
|
Merge branch 'master' into feature-75891/Electronic_Onboarding_Infocenter_Tool
|
2026-09-10 20:08:08 +02:00 |
|
|
Ivymaster
|
71dd7f9e38
|
BUG: Some random issue
|
2026-09-10 14:16:12 +02:00 |
|
|
Ivymaster
|
ccb33cde60
|
WIP
|
2026-09-09 16:53:23 +02:00 |
|
|
Ivymaster
|
5dc314febd
|
Included cherrypicked commits from lv plan range branch
|
2026-09-09 15:13:16 +02:00 |
|
|
Ivymaster
|
6ea1d4610d
|
Conflicts resolved
|
2026-09-08 10:20:52 +02:00 |
|
|
Johann Hoffmann
|
fe65dc60c4
|
finalized optional Studiengang Ansprechpartner Infoblock in Cis4 Studium page;
|
2026-09-02 18:13:41 +02:00 |
|
|
adisposkofh
|
88b5a0af46
|
lv plan range view print css
|
2026-09-02 16:04:44 +02:00 |
|