 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 |
|
|
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
|
1361c3fc00
|
Merge remote-tracking branch 'origin/feature-78286/tempus_berechtigungen' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/controllers/api/frontend/v1/tempus/Coursepicker.php
# application/libraries/KalenderLib.php
|
2026-09-01 12:42:16 +02:00 |
|
|
ma0048
|
b91ba9fdbb
|
Merge remote-tracking branch 'origin/feature-78324/tempus_coursepicker_lektor' into feature-68298/Tempus_Grundstruktur
# Conflicts:
# application/controllers/api/frontend/v1/tempus/Coursepicker.php
# public/js/components/Tempus/Coursepicker.js
|
2026-09-01 12:28:32 +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
|
fb36b2a548
|
- merged master
- updaed Verbandsbaum to work with the new version
|
2026-08-31 14:58:27 +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
|
98be0b43b7
|
- permissions geandert
|
2026-08-27 08:08:34 +02:00 |
|
|
ma0048
|
4cbf37d727
|
- ueberpruefung der berechtigung auf den studiengang von der lv beim verschieben/hinzufuegen/loeschen der lehreinheit
|
2026-08-27 08:07:39 +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 |
|
|
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 |
|
|
ma0048
|
33b50bf479
|
course picker
- kurse vom lektor koennen angezeigt werden
- searchbar button hinzuefuegt um kurse vom lektor im course picker zu laden
|
2026-08-12 11:10:07 +02:00 |
|
|
adisposkofh
|
59ac56374e
|
removed redundant response meta used for dev
|
2026-08-11 09:44:41 +02:00 |
|
|
adisposkofh
|
108f91ea1a
|
quick copy option on full name and title in profile and other lv plan
|
2026-08-10 17:09:31 +02:00 |
|
|
Harald Bamberger
|
736e897928
|
fix automated tags not found in stv search
|
2026-08-06 16:23:54 +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 |
|
|
ma0048
|
6282cb0402
|
hinzugefuegt:
- alle anzeigen option
- jetzt starten knopf
- oe rekursiv
|
2026-08-05 11:12:33 +02:00 |
|
|
Harald Bamberger
|
ecfe648bf5
|
Merge branch 'master' into studvw_lvvw_2026_08_rc_77973_76688
|
2026-08-03 19:36:18 +02:00 |
|
|
Harald Bamberger
|
2686aee158
|
avoid multiple assignments to one variable
|
2026-08-03 19:30:49 +02:00 |
|
|
Harald Bamberger
|
b7a2198057
|
Merge branch 'feature/76688-general-tabulator-issues_77080-persistence' into studvw_lvvw_2026_08_rc_77973_76688
|
2026-08-03 17:04:34 +02:00 |
|
|
adisposkofh
|
b427788e04
|
renamed tabulator presets-related phrases
|
2026-08-03 17:02:40 +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 |
|
|
chfhtw
|
2b4aef5633
|
Merge branch 'feature-77417/studvw-tags-formatter-and-header-filter' into studvw_lvvw_2026_08_rc
|
2026-07-31 12:52:29 +02:00 |
|
|
ma0048
|
cc3b47a10e
|
Raumzuteilung Entfernen / Hinzufuegen von Raeumen
Lehreinheiten entfernen
|
2026-07-31 10:34:15 +02:00 |
|
|
adisposkofh
|
d1ca6eb988
|
reworked other lv plan view data controller using profil library
|
2026-07-29 11:28:13 +02:00 |
|
|
adisposkofh
|
be4db980ad
|
fixed issue with displayed locked profile images in other lv plan
|
2026-07-29 11:17:03 +02:00 |
|
|
ma0048
|
4e16220da1
|
Merge remote-tracking branch 'origin/feature-75959/StudVw_Automatische_Tags' into studvw_lvvw_2026_08_rc
# Conflicts:
# application/controllers/api/frontend/v1/stv/Students.php
|
2026-07-29 09:53:48 +02:00 |
|
|
Harald Bamberger
|
aa52c32d40
|
Merge branch 'feature-77372/lv_verwaltung_release_fine_tuning' into studvw_lvvw_2026_08_rc
|
2026-07-28 15:50:06 +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 |
|
|
ma0048
|
f907a12d19
|
- added room selection for reservations
- fixed reservation bug without a room
- added KW search to the course picker
- fixed room updates so no assigned rooms are lost
|
2026-07-28 09:20:20 +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 |
|
|
chfhtw
|
e7d2d3502b
|
Allow callables in $redirect_method
|
2026-07-22 16:45:23 +02:00 |
|
|
Ivymaster
|
817afa545b
|
add tempus kalender tags
|
2026-07-22 15:52:31 +02:00 |
|
|
chfhtw
|
f46a3c1f68
|
LvVerwaltung: add routes for orgform and adapt endpoint to accept lower case orgform_kurzbz
|
2026-07-22 10:36:38 +02:00 |
|
|
Harald Bamberger
|
22b1f2822a
|
fix typo
|
2026-07-21 14:45:07 +02:00 |
|
|
Harald Bamberger
|
1fd15e14d5
|
Merge branch 'master' into feature-76160/StudVw_Verbandsbaum_durch_Extensions_erweiterbar_machen
|
2026-07-21 14:06:04 +02:00 |
|
|
ma0048
|
9983a48102
|
gui fuer kalender sync hinzugefuegt und syncjob angepasst
|
2026-07-21 13:50:17 +02:00 |
|
|
Harald Bamberger
|
6c25a3b262
|
Merge branch 'feature-77537/Studvw_Feedback' into studvw_2026_05_rc_tags
|
2026-07-17 11:38:46 +02:00 |
|
|
Harald Bamberger
|
362d1c8bb0
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-07-17 11:22:50 +02:00 |
|
|
Harald Bamberger
|
25a61a56b7
|
Merge branch 'master' into studvw_2026_05_rc
|
2026-07-17 11:22:20 +02:00 |
|
|
Harald Bamberger
|
afb210b0c2
|
Merge branch 'master' into studvw_2026_05_rc
|
2026-07-17 11:21:24 +02:00 |
|
|
ma0068
|
35decf476c
|
make fields deletable with keyboard: Konto Buchungsdatum, Prüfung Datum, Abschlussprüfung Datum und Sponsion, Mobilität von und bis
|
2026-07-17 09:12:02 +02:00 |
|
|
Ivymaster
|
e09fea72a4
|
add resources assignment to tempus kalender entries
|
2026-07-17 09:09:49 +02:00 |
|
|
ma0068andHarald Bamberger
|
fd1b5daf9c
|
enable deletion of zgv and zgv master date with null and empty string
|
2026-07-16 14:51:38 +02:00 |
|