Commit Graph

18966 Commits

Author SHA1 Message Date
ma0048 e9312dfbb3 lvverwaltung new release 2026-07-15 11:35:37 +02:00
ma0048 b21900d006 Merge remote-tracking branch 'origin/feature-70656/lvverwaltung_gruppen_im_baum_und_drag_and_drop' into feature-77372/lv_verwaltung_release_fine_tuning 2026-07-15 11:27:48 +02:00
ma0048 012571d070 Merge remote-tracking branch 'origin/feature-69453/lv_verwaltung_karteireiter_noten' into feature-77372/lv_verwaltung_release_fine_tuning
# Conflicts:
#	public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
#	public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
2026-07-15 09:43:53 +02:00
ma0048 a2d10ae09d Merge remote-tracking branch 'origin/feature-69454/lvverwaltung_karteireiter_lv_termine' into feature-77372/lv_verwaltung_release_fine_tuning
# Conflicts:
#	application/controllers/api/frontend/v1/LvPlan.php
#	public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
2026-07-15 09:32:03 +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
ma0048 c233902fe2 Merge remote-tracking branch 'origin/feature-70746/lvverwaltung_lektorentausch' into feature-77372/lv_verwaltung_release_fine_tuning
# Conflicts:
#	application/libraries/LektorLib.php
2026-07-15 09:20:57 +02:00
ma0048 fd8de88abb Merge remote-tracking branch 'origin/bug-69283/scroll_verhalten_lv_verwaltung_anders_als_in_studierendenverwaltung' into feature-77372/lv_verwaltung_release_fine_tuning 2026-07-15 09:17:51 +02:00
ma0048 0ec2c8c543 Merge remote-tracking branch 'origin/bug-69492/bug_lvverwaltung_doppelte_eintraege' into feature-77372/lv_verwaltung_release_fine_tuning 2026-07-15 09:17:29 +02:00
ma0048 29738b6690 Merge remote-tracking branch 'origin/feature-69353/lv_verwaltung_stundensatz_auf_leer_setzen_geht_nicht' into feature-77372/lv_verwaltung_release_fine_tuning 2026-07-15 09:17:19 +02:00
Harald Bamberger a139cc8d2e initialize with luxon date iso format 2026-07-14 13:24:04 +02:00
Harald Bamberger 35ecbdefa8 studvw prestudent ZGV date fields and konto date fields use iso date as model-type 2026-07-14 13:17:27 +02:00
Harald Bamberger 5f0b1ace51 Merge branch 'epic/LV-Evaluierung_STG-KF-Datenaggregation' 2026-07-14 07:33:24 +02:00
Harald Bamberger b891d8baa5 Merge branch 'master' into epic/LV-Evaluierung_STG-KF-Datenaggregation 2026-07-13 18:01:35 +02:00
Cristina 5dbcf9ce70 Added sancho_header_lvevaluierung_rollout.jpg and sancho_footer_lvevaluierung_rollout.jpg 2026-07-13 17:31:34 +02:00
adisposkofh c26db6cc40 minor fix to tabulator localized columns parsing 2026-07-09 11:44:04 +02:00
Cristina 8548b93ddc Added method getPreviousSameSemesterFrom in Studiensemester_model.php
Method returns the current study semester and the previous semesters of the same type (SS/WS).
2026-07-08 18:57:31 +02:00
Cristina bdc4782e9d Merge branch 'master' into epic/LV-Evaluierung_STG-KF-Datenaggregation 2026-07-08 18:54:02 +02:00
Cristina 0583990870 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2026-07-08 18:53:37 +02:00
Andreas Österreicher 5972764731 Bugfix für Fallback wenn Config nicht gesetzt ist 2026-07-08 15:42:36 +02:00
Harald Bamberger 2933a525c1 Merge branch '77804-exclude-moodle-from-other-lv-plan' 2026-07-08 14:48:28 +02:00
Harald Bamberger 5694ba7325 Merge branch 'master' into 77804-exclude-moodle-from-other-lv-plan 2026-07-08 14:45:15 +02:00
Harald Bamberger bbec7de8de Merge branch 'master' of github.com:FH-Complete/FHC-Core 2026-07-08 14:38:42 +02:00
Harald Bamberger 1d14e58d8f use current gender form 2026-07-08 14:33:02 +02:00
Harald Bamberger db2beeb51f Merge branch 'feature/76981-missing-mailing-lists' 2026-07-08 14:24:13 +02:00
Harald Bamberger e4f43cc820 Merge branch 'master' into feature/76981-missing-mailing-lists 2026-07-08 14:15:40 +02:00
adisposkofh 8adc1c8bcc not showing moodle events in other users' lv plans 2026-07-08 11:41:58 +02:00
Harald Bamberger fe195f4080 Cis App: define isMobile local since it is used in handleClick event handler 2026-07-08 10:53:40 +02:00
Harald Bamberger c69bb9ccaa Merge branch 'cis40_2026-02_rc_abgabetool_finetuning_76688' 2026-07-08 09:39:44 +02:00
Harald Bamberger 4889299dd9 remove unused file components/Cis/LvPlan/StgOrg_DEPR.js 2026-07-08 09:20:51 +02:00
Harald Bamberger 8f427344d0 remove currently unused package-lock.json 2026-07-08 09:15:25 +02:00
Harald Bamberger 0d6867799c projektbetreuer tabulator select max 1 row 2026-07-08 09:06:14 +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
Andreas Österreicher 6a16fb7515 Betreuerart wird Übergeben damit Zweitbetreuer keine Termine erstellen können 2026-07-07 14:33:29 +02:00
Andreas Österreicher 33b05e9df5 Abfrage für PersonID entfernt da sonst Zweitbetreuer/Erstbetreuer nicht geladen werden 2026-07-07 14:10:55 +02:00
Harald Bamberger ac2a1147cc do not show download links in OtherLvPlan and StgOrg LvPlan mode 2026-07-07 11:44:04 +02:00
Harald Bamberger 8d7fdb0254 Merge branch 'master' into cis40_2026-02_rc_abgabetool_finetuning 2026-07-07 11:15:53 +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
Cristina 335753be8c Adapted Lvevaluierung Mail texte "Evaluierungszeitfenster" instead of "Evaluationszeitraum" 2026-07-06 12:19:28 +02:00
Harald Bamberger 044e29f557 Merge branch 'feature-77662/Absolventen_Zugriff_CIS4' 2026-07-01 14:47:52 +02:00
Harald Bamberger f5cdb0a2fb add configs to define grace period and roles, add logic to benutzerberechtigungs class 2026-07-01 12:10:06 +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 6264006728 flat table selectAll Handler fix; call checkZuordnung just how we thoughtcrimed it in feature-76667/ProjektarbeitUploadZuordnungErrorMessage 2026-06-29 14:30:41 +02:00
Johann Hoffmann 0007460428 phrasen archaeology; selectionCheckFlat on flatTable; 2026-06-29 13:58:02 +02:00
Andreas Österreicher 8cc0462712 Merge branch 'bug-76560/Download_Notenlisten_einschraenken' 2026-06-29 13:33:04 +02:00
Paolo 4162305ac6 Improved the permissions check in the cis/private/lehre/notenliste.xls.php 2026-06-29 13:28:57 +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
Johann Hoffmann 48798a9cee zusatzdaten added to new getMitarbeiterProjektarbeiten implementation; fix assignment of noteBackend variable -> needed for benotet headers; WIP phrasen archeology 2026-06-29 13:07:11 +02:00
Paolo 6508301526 Merge branch 'master' into bug-76560/Download_Notenlisten_einschraenken 2026-06-29 09:32:53 +02:00