 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
|
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 |
|
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
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
|
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
|
81c16a3bf2
|
- wording angepasst lehreinheit -> lvteil
- Kollisionscheck an/aus wird angezeigt
- Shortcut für Ignore-Collision (F9) hinzugefuegt
- coursepicker:
- design angepasst
- favorisieren ermoeglicht
- phrases
- bei lv immer alle raeume/lektoren/gruppen anzeigen unabhaengig vom filter
|
2026-07-15 14:58:41 +02:00 |
|
|
ma0048
|
96bf45ceb0
|
Merge remote-tracking branch 'origin/feature-75410/lvverwaltung_finetuning' into feature-77372/lv_verwaltung_release_fine_tuning
# Conflicts:
# system/phrasesupdate.php
|
2026-07-15 09:26:55 +02:00 |
|
|
Harald Bamberger
|
f8d8d501ca
|
Merge branch 'studvw_2026_05_rc_tags' into feature-77537/Studvw_Feedback
|
2026-07-13 14:42:54 +02:00 |
|
|
Harald Bamberger
|
b5e65cf072
|
Merge branch 'master' into studvw_2026_05_rc
|
2026-07-08 16:42:04 +02:00 |
|
|
Harald Bamberger
|
1d14e58d8f
|
use current gender form
|
2026-07-08 14:33:02 +02:00 |
|
|
Harald Bamberger
|
e4f43cc820
|
Merge branch 'master' into feature/76981-missing-mailing-lists
|
2026-07-08 14:15:40 +02:00 |
|
|
Harald Bamberger
|
5602c7091a
|
Merge branch 'feature/76688-general-tabulator-issues_76776-localization' into cis40_2026-02_rc_abgabetool_finetuning_76688
|
2026-07-08 07:17:24 +02:00 |
|
|
ma0068
|
c86d6f4bf3
|
- enable opening in new tab with prevent.default
- rendering of maillinks
- useBCC without CC
|
2026-07-07 14:31:23 +02:00 |
|
|
Harald Bamberger
|
0fd938e85c
|
Merge branch 'master' into feature/76688-general-tabulator-issues_76776-localization
|
2026-07-07 11:08:19 +02:00 |
|
|
Johann Hoffmann
|
b57fe4839b
|
update tooltip phrase + keyversion
|
2026-07-06 15:15:02 +02:00 |
|
|
ma0068
|
c194e94b5c
|
add private email to detailHeader
|
2026-07-02 16:46:09 +02:00 |
|
|
Johann Hoffmann
|
d405296a14
|
also show email contact for zweitbetreuer in student page + distinguish them in the label in case of more than 1 betreuer;
|
2026-06-30 13:02:19 +02:00 |
|
|
Johann Hoffmann
|
787e5d0ee4
|
usage of $p.t('abgabetool/c4paatyp' + typKurzbz) instead of raw bezeichnung for abgabetyp in abgabeterminFormatter for nextTermin/prevTermin cells; added phrasen from feature-77384/ZweitbegutachterSpeichernFix branch;
|
2026-06-30 11:57:48 +02:00 |
|
|
Johann Hoffmann
|
0007460428
|
phrasen archaeology; selectionCheckFlat on flatTable;
|
2026-06-29 13:58:02 +02:00 |
|
|
Johann Hoffmann
|
8abb028f55
|
Merge branch 'feature-76667/ProjektarbeitUploadZuordnungErrorMessage' into cis40_2026-02_rc_abgabetool_finetuning
# Conflicts:
# application/controllers/api/frontend/v1/Abgabe.php
|
2026-06-29 13:21:14 +02:00 |
|