 Ivymaster
|
02ff8d0e3c
|
Conflicts resolved
|
2026-09-02 15:01:56 +02:00 |
|
|
ma0048
|
eeb49e1967
|
Merge remote-tracking branch 'origin/feature-78287/tempus_raumzuordnung' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/libraries/KalenderLib.php
# application/libraries/RaumvorschlagLib.php
|
2026-09-01 13:08:38 +02:00 |
|
|
ma0048
|
d727012806
|
Merge remote-tracking branch 'origin/feature-78285/tempus_stundenraster_ausschalten_nur_mit_eigener_berechtigung' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# system/dbupdate_3.4.php
|
2026-09-01 12:32:38 +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 |
|
|
Ivymaster
|
61d7268f90
|
Conflicts resolved
|
2026-09-01 11:52:25 +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 |
|
|
ma0048
|
8184555e12
|
location hinzugefuegt
raumlose planung aktivierbar/deaktivierbar
automatische zuteilung zum priorraum aktivierbar/deaktivierbar
raum zuteilung ueber dialog aktivierbar/deaktivierbar
|
2026-08-13 13:36:35 +02:00 |
|
|
Werner Masik
|
d85a3cb08f
|
extract DB migration for gehaltsanpassungtyp into separate file
|
2026-08-12 15:18:35 +02:00 |
|
|
ma0048
|
b2aa4c4922
|
stundenraster mit eigener berechtigung basis/tempus_stundenraster deaktivierbar
|
2026-08-12 11:39:17 +02:00 |
|
|
Ivymaster
|
96526be231
|
Add kalender column rename from eindeutige_gruppen_id to eindeutige_kalender_gruppen_id
|
2026-08-06 13:43:20 +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 |
|
|
Harald Bamberger
|
e9fc0629f5
|
Merge branch 'feature/76688-general-tabulator-issues_77080-persistence' into studvw_lvvw_2026_08_rc_77973
|
2026-08-03 16:06:34 +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 |
|
|
Harald Bamberger
|
02a97fb0e2
|
Merge branch 'feature-76160/StudVw_Verbandsbaum_durch_Extensions_erweiterbar_machen' into studvw_2026_08_rc
|
2026-07-28 15:35:54 +02:00 |
|
|
adisposkofh
|
89ea4187fa
|
merged master into
|
2026-07-27 15:58:08 +02:00 |
|
|
chfhtw
|
0e099b2752
|
Remove deprecated files and lv_favorites variable
|
2026-07-24 14:05:50 +02:00 |
|
|
Ivymaster
|
817afa545b
|
add tempus kalender tags
|
2026-07-22 15:52:31 +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 |
|
|
chfhtw
|
b0f317951b
|
Add lvv_favorites
|
2026-07-15 16:18:39 +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 |
|
|
Harald Bamberger
|
7e6d670d82
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-07-13 14:32:51 +02:00 |
|
|
Harald Bamberger
|
eb9c882fe9
|
Merge branch 'master' into cis40_2026-02_rc
|
2026-06-18 08:48:52 +02:00 |
|
|
Harald Bamberger
|
245d0d3369
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-06-17 17:15:37 +02:00 |
|
|
adisposkofh
|
0bb81b23e5
|
implemented table presets functionality
|
2026-06-09 16:07:55 +02:00 |
|
|
Andreas Österreicher
|
30b8a406a5
|
Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into rc_reihungstest
|
2026-06-01 09:10:35 +02:00 |
|
|
Harald Bamberger
|
8b2ef4e832
|
Merge branch 'master' into feature-75959/StudVw_Automatische_Tags
|
2026-05-11 10:54:26 +02:00 |
|
|
ma0068
|
e5e22931a9
|
add db queries for update system, update tags in config
|
2026-04-24 12:49:00 +02:00 |
|
|
Harald Bamberger
|
e984425e36
|
Merge branch 'feature-68530/Dashboard_Cleanup_Admin' into cis40_2026-02_rc
|
2026-04-23 12:09:09 +02:00 |
|
|
Harald Bamberger
|
2c1702a20b
|
Merge branch 'feature-68957/CIS4_Dashboard_Bookmark_Widget_Sort_Tags' into cis40_2026-02_rc
|
2026-04-23 11:19:17 +02:00 |
|
|
Harald Bamberger
|
6cc09969dd
|
Merge branch 'master' into feature-68530/Dashboard_Cleanup_Admin
|
2026-04-20 10:45:20 +02:00 |
|
|
Harald Bamberger
|
1c2491385f
|
Merge branch 'master' into feature-68957/CIS4_Dashboard_Bookmark_Widget_Sort_Tags
|
2026-04-17 10:38:00 +02:00 |
|
|
adisposkofh
|
70ebe34f1f
|
merge develop into -- manual conflict resolution
|
2026-04-16 16:09:03 +02:00 |
|
|
ma0048
|
13e8a1a9f6
|
bug fixed + infocenter performance
|
2026-04-16 14:21:02 +02:00 |
|
|
Harald Bamberger
|
6ce14a25d7
|
Merge branch 'master' into feature-70376/Lohnguide
|
2026-04-15 11:49:26 +02:00 |
|
|
adisposkofh
|
7daaf79fcc
|
implemented permission for viewing other users' lv plans
|
2026-04-13 15:44:09 +02:00 |
|
|
Werner Masik
|
5c463c0866
|
add vordienstzeit to lohnguide
|
2026-04-06 22:25:13 +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 |
|
|
chfhtw
|
00e019d6fe
|
cleanup db data
|
2026-03-26 15:21:41 +01:00 |
|
|
ma0068
|
b90c26412a
|
DB update: new Organisationseinheittyp Programm
|
2026-03-20 13:06:16 +01:00 |
|
|
Harald Bamberger
|
059b13938e
|
Merge branch 'master' into feature-70376/Lohnguide
|
2026-03-18 11:46:27 +01:00 |
|
|
Werner Masik
|
41b2a6d1d4
|
added db migration for lohnguide
|
2026-03-04 10:53:30 +01:00 |
|
|
Harald Bamberger
|
e12b7e1ed5
|
add indexes for person_id to table msg_message and msg_recipient, ensure tabulator data request is made before requests of create msg components
|
2026-02-17 08:06:30 +01:00 |
|
|
Andreas Österreicher
|
023c2a10be
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
|
2026-02-04 10:21:17 +01:00 |
|
|
Harald Bamberger
|
a3a03f6362
|
update check system to create or update widget path to start with public/...
|
2026-02-03 13:49:06 +01:00 |
|
|
Johann Hoffmann
|
709aba5783
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
# Conflicts:
# application/models/organisation/Studiengang_model.php
|
2026-01-26 15:06:22 +01:00 |
|
|
Cristina
|
9b90e0edde
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-01-20 10:53:36 +01:00 |
|
|
ma0048
|
43a1d163a3
|
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
|
2026-01-20 09:21:47 +01:00 |
|
|
Andreas Österreicher
|
47ea1e848c
|
Merge branch 'feature-69528/reihungstestueberwachung_constructor'
|
2026-01-19 10:17:38 +01:00 |
|
|
Cristina
|
6512ad0f1c
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-01-13 13:38:04 +01:00 |
|