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
adisposkofh
c34a74c040
reservierung model table alias fix
2026-09-22 14:16:31 +02:00
adisposkofh
aaf8dd16ef
merged feature-78456/MeineReservierungenUebersichtCis4 into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-16 15:08:23 +02:00
adisposkofh
09f18d9039
merged cis40_2026-05_ma_rc_routerlink_ma0080 into
2026-09-15 17:03:03 +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
ma0048
61ef27e5eb
Merge branch 'feature-77949/tempus_synchronisation' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# application/libraries/KalenderLib.php
# system/dbupdate_3.4.php
2026-09-01 12:20:12 +02:00
ma0048
51886960bb
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# application/controllers/api/frontend/v1/lv/StgTree.php
# public/js/components/Stv/Studentenverwaltung/Verband.js
# system/dbupdate_3.4.php
# tests/cypress/.gitignore
2026-08-31 12:49:28 +02:00
Harald Bamberger
9bf5bc2ad9
more generic bugfix, to use studentlehrverband only with date_range for the same studiensemester_kurzbz
2026-08-24 07:26:12 +02:00
Harald Bamberger
75d2cabdbe
bugfix lv-plan
2026-08-20 15:10:26 +02:00
Harald Bamberger
a5d4629f07
Merge branch 'cis40_2026-05_ma_rc_78461_reservation_group_options' into cis40_2026-05_ma_rc
2026-08-20 07:48:18 +02:00
Harald Bamberger
37d9ef66ed
Merge branch 'features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster' into cis40_2026-05_ma_rc
2026-08-20 07:38:16 +02:00
Harald Bamberger
b2213bff62
Merge branch 'bugfix-70747/excluding-zeitverfugbarkeit-zeitsperren-option' into features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster
2026-08-20 07:14:47 +02:00
Harald Bamberger
b80805e09c
Merge branch 'cis40_2026-05_ma_rc' into cis40_2026-05_ma_rc_78461_reservation_group_options
2026-08-18 18:22:20 +02:00
ma0068
9a592047a0
merge feature-70747/Zeitsperren_auf_VueJs_Portieren into feature-77941/CIS_MA_Zeitsperren_Portieren
2026-08-18 13:54:02 +02:00
ma0068
e6947a3246
merge master into feature-77941/CIS_MA_Zeitsperren_Portieren
2026-08-18 12:04:28 +02:00
adisposkofh
00f07ba6f0
excluding zeitverfugbarkeit option from zeitsperren dropdown
2026-08-14 14:13:03 +02:00
Harald Bamberger
7910cf3055
Merge branch 'master' into cis40_2026-05_ma_rc
2026-08-13 17:36:38 +02:00
Johann Hoffmann
67bbe9c105
new cis4 page "MyReservations" as new adaptation of cis/private/lvplan/stpl_reserve_list.php;
2026-08-13 16:37:03 +02:00
adisposkofh
b2af8587c2
displaying reservation group information
2026-08-12 13:27:07 +02:00
adisposkofh
475b6210e0
displaying room additional info in reservations window
2026-08-10 15:02:12 +02:00
adisposkofh
4e67d7b765
fixed issue with unresponsive reservation delete buttons in widget and my lv plan
2026-08-10 13:21:48 +02:00
Ivymaster
a912fcf019
Add kalender column rename from eindeutige_gruppen_id to eindeutige_kalender_gruppen_id
2026-08-06 13:20:51 +02:00
ma0068
0a46bf52dd
- neue funktion loadZeitsperrenforUid
...
– route für maUid
- Zeitsperren als Cis-App
– link für Zeitsperren maUid in Mitarbeiterprofil
- component ZeitsperrenMitarbeiterUid
- Dropdown oes:show only active Oes
2026-08-04 08:00:40 +02:00
ma0048
8636364c08
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-77949/tempus_synchronisation
...
# Conflicts:
# system/dbupdate_3.4.php
2026-08-03 12:31:07 +02:00
ma0068
96b4210d21
refactor backend
...
css file for showing inactive items in dropdown
fix missing view for vertretung zeitsperren
sticky top for header
2026-07-30 15:29:15 +02:00
ma0068
e876b9e4ab
Zeitsperren Mitarbeiter - add component to Vertragsverwaltung
2026-07-24 13:11:40 +02:00
Ivymaster
02a81fd52e
BUG: fix for available tempus event resource suggestions
2026-07-22 08:58:58 +02:00
ma0048
9983a48102
gui fuer kalender sync hinzugefuegt und syncjob angepasst
2026-07-21 13:50:17 +02:00
Ivymaster
e09fea72a4
add resources assignment to tempus kalender entries
2026-07-17 09:09:49 +02:00
ma0048
9abaf30ed3
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# public/js/components/Calendar/Base/DragAndDrop.js
# public/js/components/Calendar/Base/Grid/Line.js
# public/js/composables/EventLoader.js
2026-07-15 15:48:44 +02:00
ma0048
a2d10ae09d
Merge remote-tracking branch 'origin/feature-69454/lvverwaltung_karteireiter_lv_termine' into feature-77372/lv_verwaltung_release_fine_tuning
...
# Conflicts:
# application/controllers/api/frontend/v1/LvPlan.php
# public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
2026-07-15 09:32:03 +02:00
ma0048
c233902fe2
Merge remote-tracking branch 'origin/feature-70746/lvverwaltung_lektorentausch' into feature-77372/lv_verwaltung_release_fine_tuning
...
# Conflicts:
# application/libraries/LektorLib.php
2026-07-15 09:20:57 +02:00
adisposkofh
d9ea5a95af
fixed issue with undefined reservierung attributes
2026-05-11 15:04:32 +02:00
Harald Bamberger
cffa493984
Merge branch 'feature-68301/cis4_ma_raumreservierung' into cis40_2026-05_ma_rc
2026-05-04 18:17:53 +02:00
Harald Bamberger
9030cdcc76
Merge branch 'feature-70747/Zeitsperren_auf_VueJs_Portieren' into cis40_2026-05_ma_rc
2026-05-04 18:06:21 +02:00
ma0048
57597dac29
- added reservierungen
...
- added updatemails
- added reservierungssync
- updated status kurzbz
- reservierung renderer for tempus
2026-04-28 20:17:50 +02:00
Harald Bamberger
c53d451000
Merge branch 'master' into feature-68301/cis4_ma_raumreservierung
2026-04-20 16:34:30 +02:00
adisposkofh
f1c3c8296f
implemented 'OtherLvPlan' to view other users' timetables
2026-04-13 10:41:41 +02:00
chfhtw
f06e59b362
Merge branch 'master' into feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe
2026-04-08 14:13:02 +02:00
ma0048
8dd42361a0
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
# system/dbupdate_3.4.php
2026-03-30 09:18:31 +02:00
ma0048
e990bb3d81
tempus pre-alpha version
2026-03-25 14:41:13 +01:00
Harald Bamberger
00fae2fa15
Merge branch 'master' into vv_und_studvw_2026_02_rc4
2026-02-23 09:28:54 +01:00
Harald Bamberger
d98b7fd67a
fix duplicates in lvplan for special groups
2026-02-19 18:34:27 +01:00
Harald Bamberger
69749da331
Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader
2026-02-03 11:46:19 +01:00
ma0068
c34ffedb42
Autocomplete Field Vertretung
...
Form with ISO fields for hours
Admin functionality for seeing Timelocks of uid in route
Backend with CI-Validations
Phrases
2026-01-21 10:59:16 +01:00
ma0048
43a1d163a3
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
2026-01-20 09:21:47 +01:00
ma0048
e26387a75a
lektoren tausch auch bei verplanten lektoren hinzugefuegt
2026-01-19 15:08:59 +01:00
ma0068
b5382b1bdf
Form and Start Backend
2026-01-15 15:39:42 +01:00
ma0068
519cbc7601
base structure and table
2026-01-14 09:26:15 +01:00
Cristina
6512ad0f1c
Merge branch 'master' into epic-56039/LV-Evaluierung
2026-01-13 13:38:04 +01:00
ma0048