 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
|
357a51bdcb
|
Merge remote-tracking branch 'origin/feature-78317/tempus_delete_status' into feature-68298/Tempus_Grundstruktur
|
2026-09-01 12:21:53 +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 |
|
|
Harald Bamberger
|
7ce81ad4bd
|
Merge branch 'feature-78292/dv_gehaltsbestandteil_ersteinstufung'
|
2026-08-19 07:57:07 +02:00 |
|
|
Harald Bamberger
|
ea56ec8daa
|
change wording
|
2026-08-19 07:50:50 +02:00 |
|
|
Werner Masik
|
d8355ba3f5
|
added Funktionsänderung to gehaltsanpassungtyp
|
2026-08-13 14:56:04 +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 |
|
|
Harald Bamberger
|
c81b5338de
|
Merge branch 'master' into feature-78292/dv_gehaltsbestandteil_ersteinstufung
|
2026-08-12 11:39:49 +02:00 |
|
|
ma0048
|
b2aa4c4922
|
stundenraster mit eigener berechtigung basis/tempus_stundenraster deaktivierbar
|
2026-08-12 11:39:17 +02:00 |
|
|
ma0048
|
b5ac68840b
|
fixed bug after column rename
|
2026-08-12 11:31:05 +02:00 |
|
|
adisposkofh
|
a397460e0e
|
Merge branch 'master' into feature/78128-quick-copy-full-name-and-title
|
2026-08-11 09:43:27 +02:00 |
|
|
Harald Bamberger
|
046a552f34
|
Merge branch 'master' into feature-76995/StudStatusModal_Hinweis_Beratungsgespraech_bei_Abmeldung
|
2026-08-11 08:11:55 +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
|
8bfd90e159
|
Merge branch 'master' into feature-69378/Studienverlauf_verlinken_im_neuen_FAS
|
2026-08-10 14:48:41 +02:00 |
|
|
Werner Masik
|
bd99f3f927
|
add db schema for gehaltsanpassungtyp
|
2026-08-10 12:20:30 +02:00 |
|
|
ma0048
|
b58b4446a9
|
todelete auf to_delete umebannnt
to_delete_live & to_delete_preview hinugefuegt
history logik umbau
|
2026-08-10 10:57:34 +02:00 |
|
|
Harald Bamberger
|
a00f6363d9
|
add legacy bis links to app menu and needed phrases, consistently use appMenuLvPlanungItems computed for LvPlanung app menu extra items
|
2026-08-07 17:11:38 +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
|
b6aa459b98
|
Merge branch 'feature-777242/StudVW_alternative_Contacting_ma0080' into studvw_lvvw_2026_08_rc_77973_76688
|
2026-08-06 11:56:18 +02:00 |
|
|
Harald Bamberger
|
53a9fab70b
|
use neutral phrase for webmail
|
2026-08-06 09:43:02 +02:00 |
|
|
ma0048
|
6282cb0402
|
hinzugefuegt:
- alle anzeigen option
- jetzt starten knopf
- oe rekursiv
|
2026-08-05 11:12:33 +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 |
|
|
Harald Bamberger
|
9f68fe6b3b
|
Merge branch 'feature-77973/StudVw-Feedback_Finetuning_bhmod' into studvw_lvvw_2026_08_rc
|
2026-08-03 11:18:34 +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 |
|
|
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 |
|
|
adisposkofh
|
b277725cc3
|
displaying name of applied tabulator preset (w/ 'modified' marker as necessary)
|
2026-07-28 12:48:28 +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
|
4a9f41160f
|
Add smoke test for calendar event tag assignment
|
2026-07-24 09:16:40 +02:00 |
|
|
chfhtw
|
5c7df11ff3
|
Phrase corrected
|
2026-07-23 15:05:26 +02:00 |
|
|
ma0068
|
dcd17bb34f
|
add Compatibility Mode for SOGO
add logic for BCC to default Mail Client Version
add phrases
|
2026-07-23 11:25:22 +02:00 |
|
|
Ivymaster
|
817afa545b
|
add tempus kalender tags
|
2026-07-22 15:52:31 +02:00 |
|
|
ma0068
|
a8dd995195
|
rebuild tags for whole studiengang / selection
refactor backend for multiaction rebuildTags
add phrases
refactor haederFilter
|
2026-07-22 14:11:07 +02:00 |
|
|
ma0048
|
9983a48102
|
gui fuer kalender sync hinzugefuegt und syncjob angepasst
|
2026-07-21 13:50:17 +02:00 |
|
|
ma0068
|
68292b60af
|
add Tags Incoming and Preabbrecher
|
2026-07-20 17:36:54 +02:00 |
|
|
chfhtw
|
65e76e951a
|
Translate treemenu entries
|
2026-07-17 12:01: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
|
1abfbccb3e
|
Merge branch 'bug-77399/AppMenu_Show_Toasts' into studvw_2026_05_rc_tags
|
2026-07-17 11:25:11 +02:00 |
|
|
Ivymaster
|
a30affba3a
|
add tempus cypress tests
|
2026-07-17 09:10:08 +02:00 |
|