Commit Graph

17623 Commits

Author SHA1 Message Date
Harald Bamberger 483547cd9c Merge branch 'feature-63394/StV_Favoriten_64_Zeichen_Variablenbeschraenkung' into demo-cis40 2025-09-30 16:37:34 +02:00
Harald Bamberger 10b6641aa2 Merge branch 'master' into feature-63394/StV_Favoriten_64_Zeichen_Variablenbeschraenkung 2025-09-30 14:51:10 +02:00
Harald Bamberger 345413cd1f change display date of database dump 2025-09-30 14:15:16 +02:00
Harald Bamberger 046a60b89c Merge branch 'master' into demo-cis40 2025-09-30 13:26:17 +02:00
Harald Bamberger 81e705f297 Merge branch 'feature-63430_63431/bugfixes_checkbox_dual_and_setAbsolvent_with_user_schuhch' 2025-09-30 13:22:48 +02:00
Harald Bamberger 9a74ab9c63 add empty option to zgvnation, zgvmanation, zgvdoktornation, berufstaetigkeit_code and ausbildungcode. to not violate fk set empty value for those to null in backend 2025-09-30 13:19:18 +02:00
Harald Bamberger 8fdabcb317 handle boolean values explicitly 2025-09-30 12:22:12 +02:00
Harald Bamberger 93fa0ed180 deleteStatus fix isMeldestichtagErreicht comparison, add modal-dialog-scrollable class to status modal 2025-09-30 10:51:14 +02:00
Harald Bamberger 3551172c0b reenable meldestichtag check 2025-09-30 09:33:07 +02:00
Harald Bamberger 795378bf40 Merge branch 'master' into feature-63430_63431/bugfixes_checkbox_dual_and_setAbsolvent_with_user_schuhch 2025-09-30 09:13:10 +02:00
Harald Bamberger da725e3ab1 Merge branch 'feature-63444/stv_mehrfachaktion_mail_an_private_oder_interne_adresse' into demo-cis40 2025-09-29 17:40:26 +02:00
Harald Bamberger 76e6874a1a Merge branch 'master' into feature-63444/stv_mehrfachaktion_mail_an_private_oder_interne_adresse 2025-09-29 17:33:23 +02:00
Harald Bamberger edd34941cc Merge branch 'feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren' into demo-cis40 2025-09-29 16:57:10 +02:00
Harald Bamberger 3c47453762 add projektarbeit tab to tab_order 2025-09-29 15:49:13 +02:00
Harald Bamberger 4fa2de5105 Merge branch 'master' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren 2025-09-29 15:37:42 +02:00
Harald Bamberger c65686ef42 Merge branch 'feature-63373/FHC4_Studierendenverwaltung_Dokumente_erstellen' into demo-cis40 2025-09-29 13:53:30 +02:00
Harald Bamberger ca55c8b1a7 Archiv.js: import add missing file extension, DocumentDropdown: remove wrapper div causing button not being aligned 2025-09-29 13:48:14 +02:00
Andreas Österreicher 9db14effdc Merge branch 'feature-67500/AnwesenheitenNanotuning' 2025-09-29 11:13:04 +02:00
Harald Bamberger 5c66dfad49 Merge branch 'master' into feature-63373/FHC4_Studierendenverwaltung_Dokumente_erstellen 2025-09-29 08:24:18 +02:00
Harald Bamberger c7729f85df Merge branch 'master' into demo-cis40 2025-09-29 08:09:33 +02:00
Harald Bamberger 8403384cc2 Merge branch 'feature-59258/Studierendenverwaltung_Kontakttypen' 2025-09-29 08:05:22 +02:00
Harald Bamberger 4a55b73461 do not query hidden contacts or the hidden contact type from db, remove hidden contact type filtering from frontend code 2025-09-29 08:03:04 +02:00
Harald Bamberger 159904b8ad Merge branch 'master' into feature-59258/Studierendenverwaltung_Kontakttypen 2025-09-26 15:00:00 +02:00
Harald Bamberger 245e4a3028 Merge branch 'feature-62462/FHC4_Studierendenverwaltung_Delete_Photo' 2025-09-26 14:37:55 +02:00
Harald Bamberger 0df9cf769f strip data image base64 prefix before storing foto, show dummy profile img when foto is null in DetailsHeader 2025-09-26 14:33:20 +02:00
Harald Bamberger 464b99b3f9 Merge branch 'master' into feature-62462/FHC4_Studierendenverwaltung_Delete_Photo 2025-09-26 14:29:32 +02:00
Johann Hoffmann a021c85920 schönere phrasen 2025-09-25 17:23:03 +02:00
Harald Bamberger 6047b19f47 do not show contacts with type hidden in cis4 profile 2025-09-25 17:19:19 +02:00
Harald Bamberger e5778acf9d Merge branch 'feature-63437/cis4_iframe_component' 2025-09-25 16:15:17 +02:00
Harald Bamberger 58b942f044 fix typo in template_kurzbz 2025-09-25 16:14:09 +02:00
Harald Bamberger 2ef2948a6e prevent strange effects when switching between content_types 2025-09-25 16:02:43 +02:00
ma0048 5efad50b62 added missing iframe component 2025-09-23 08:31:00 +02:00
Alexei Karpenko 3f0f48a4e0 Student.php: bracket bugfix, return person id of added Personinstead of true, Studierendenverwaltung Projektarbeit phrases 2025-09-22 17:34:50 +02:00
Harald Bamberger eaec76c3d2 Merge branch 'master' into feature-63437/cis4_iframe_component 2025-09-22 17:03:42 +02:00
Alexei Karpenko a533294121 removed addMeta in Student.php Studierendenverwaltung 2025-09-22 15:54:26 +02:00
Andreas Österreicher b5d44de0b4 Merge branch 'feature-66843/infocenter_studentenverwaltung_verlinkung' 2025-09-22 14:15:49 +02:00
Andreas Österreicher 60d09bd2a7 Merge branch 'bug-67504/notizcontroller_delete' 2025-09-22 14:10:17 +02:00
Andreas Österreicher 2b91ae87c0 Merge branch 'feature-61714/infocenter_hinweis_wenn_die_selbe_person_bereits_einen_aufrechten_status_im_selben_studiengang_hat' 2025-09-22 14:07:54 +02:00
Andreas Österreicher efcc4b8ea5 Merge branch 'feature-62331/infocenter_anmerkung_zur_bewerbung_weiterleiten' 2025-09-22 13:59:13 +02:00
ma0048 c69877ed85 bug beim loeschen von einer notiz mit doc 2025-09-22 13:41:58 +02:00
Alexei Karpenko 8e7a1a2ddd Merge branch 'master' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren 2025-09-22 13:39:36 +02:00
Andreas Österreicher f97951966c Merge branch 'deploy_22_09_25_lvverwaltung' 2025-09-22 10:49:15 +02:00
ma0048 ef56af6337 lv teil hinzufuegen beim semesterwechsel das richtige semester preselecten
lv teil kopieren nur bei lv teilen anzeigen
2025-09-22 09:40:37 +02:00
Andreas Österreicher 3f5801f6ed Menüpunkt für LV-Verwaltung im Vilesci hinzugefügt 2025-09-22 09:26:13 +02:00
Harald Bamberger 41143a6dfc profile functions use tbl_benutzerfunktion.beschreibung in column description, format date columns in profile tabulators, fix vuejs dev version warnings 2025-09-19 10:58:53 +02:00
Harald Bamberger 0577f3f8b9 Cis4 Profile only show current userfunctions with description from tbl_funktion 2025-09-18 18:46:11 +02:00
ma0048 41dbd83bdb phrases
tags als default entfernt
master gemerged
2025-09-18 15:27:04 +02:00
ma0048 6a31eade8b Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into deploy_22_09_25_lvverwaltung
# Conflicts:
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php
2025-09-18 15:04:01 +02:00
ma0048 57531d956d gruppen in eigenen tab verschoben
styling
phrases
2025-09-18 13:18:44 +02:00
Harald Bamberger 5b42c438d0 Merge branch 'master' into feature-62462/FHC4_Studierendenverwaltung_Delete_Photo 2025-09-18 07:47:53 +02:00