Commit Graph

620 Commits

Author SHA1 Message Date
ma0048 7eee9df8a6 phrases gefixed 2025-07-11 07:45:50 +02:00
ma0048 57af813cb4 Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into demo
# Conflicts:
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php
2025-07-11 07:41:17 +02:00
ma0048 5b2b715a16 userstory 61241: bugs behoben 2025-07-07 08:59:36 +02:00
Johann Hoffmann f4a175b93e Merge branch 'feature-61592/AnwesenheitenFinetuning' into demo 2025-07-04 11:33:08 +02:00
Johann Hoffmann 101636e9fc timeline tooltip 2025-07-04 11:31:13 +02:00
Johann Hoffmann f2180981b4 Merge branch 'feature-61592/AnwesenheitenFinetuning' into demo 2025-07-03 15:51:27 +02:00
Johann Hoffmann 475290e3ef yet another phrase 2025-07-03 15:47:06 +02:00
Johann Hoffmann c5abf8c293 Merge branch 'feature-61592/AnwesenheitenFinetuning' into demo 2025-07-03 13:32:56 +02:00
Johann Hoffmann 7fc98bd6a4 tooltip update 2025-07-03 13:23:47 +02:00
Johann Hoffmann d9cddd768f Merge branch 'feature-61592/AnwesenheitenFinetuning' into demo 2025-07-03 11:33:40 +02:00
Johann Hoffmann 919471d067 phrasen adjustment & error catch cases 2025-07-03 11:32:00 +02:00
Johann Hoffmann 74b1640a52 Merge branch 'feature-61592/AnwesenheitenFinetuning' into demo 2025-07-02 15:27:17 +02:00
Johann Hoffmann 4b26067380 moar anw phrasen 2025-07-02 15:20:17 +02:00
Johann Hoffmann 1c73fdc83c phrasen 2025-06-30 13:12:21 +02:00
Johann Hoffmann 057288a4a5 phrasen & rechte rename 2025-06-25 16:02:51 +02:00
Johann Hoffmann 913211e84d even more & better anw phrasen 2025-06-18 16:23:35 +02:00
Andreas Österreicher 909d7f62f2 Merge branch 'feature-40314/Electronic_Onboarding_Anbindung_IDA' into demo 2025-06-16 11:02:52 +02:00
Johann Hoffmann fce55e38ae more & better anw phrasen 2025-06-12 17:18:52 +02:00
Johann Hoffmann 3cebbc9fba modal optional expand to full size button - used for qr window; added missing phrase editEntschuldigung; 2025-05-28 17:04:07 +02:00
ma0048 f96bfbe000 lehrfächerverteilung v1 2025-05-28 07:51:10 +02:00
Andreas Österreicher 8786b60c4c Merge branch 'master' into feature-56330/Digi-Anw-Feedback 2025-05-21 14:11:50 +02:00
Johann Hoffmann 47917e42c3 compare datetime timestamp for n-workdays ago calculation; more eager check on change of kontrollzeiten/termine if they match a termin; added missing phrase; fetch uploaddatum in same format as von/bis for entschuldigungen so date headerfilter can work as intended; zugangscode zeitlich abgelaufen show error message; 2025-04-17 12:07:54 +02:00
Johann Hoffmann 3f607ec241 phrasen 2025-04-15 18:03:51 +02:00
ma0048 1888c51a48 master gemerged
phrase bugfix
2025-04-15 11:09:59 +02:00
ma0048 ad93a0a84c Merge branch 'refs/heads/master' into feature-54827/internationalisierungsmassnahmen_optimierungen 2025-04-15 11:09:05 +02:00
Johann Hoffmann 6b6ec311c7 Merge branch 'master' into feature-56330/Digi-Anw-Feedback 2025-04-14 15:23:31 +02:00
Johann Hoffmann 8218c915d5 anw phrasen 2025-04-14 15:14:49 +02:00
Andreas Österreicher 8a7290359a Merge branch 'master' into feature-56033/Beurteilungsformulare_neue_Kategorien_ab_SS2025 2025-04-01 10:52:04 +02:00
Johann Hoffmann ba806c13fb assistenz edit entschuldigung modal for editing von/bis date (on open excuse notes) & textarea for notiz - which is still limited to 255 characters; added student semester column to assistenz table; removed column width constraints & layout changed to fitData, persistence option is TRUE now; WIP von/bis/uplaoddate headerfilter; automatically send email to students on entschuldigungn status changed; added minimum time range for Kontrolle to be at least the length of 1 teaching unit(per config) - currently 45minutes; start new kontrolle modal more clearly shows when time & date values have been read from stundenplan; increased qr degeneration timer from 200 to 5000ms to avoid "missed" checkins due to network time; lektor can retrieve all entschuldigungen ranges & statuses of students when hovering their row; lektor can show anw qr window seperately now; into externalzuordnung admin/person_id fix in deleteEntschuldigung; moved fetch semesterinfo into global setup; fixed some vue template warnings; 2025-03-27 17:15:37 +01:00
Andreas Österreicher 392c15da77 Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite 2025-03-27 09:32:59 +01:00
Cristina b18b3b62a7 Merge remote-tracking branch 'origin/feature-40953/LV-Template_Uebersichtsseite' into feature-40953/LV-Template_Uebersichtsseite
# Conflicts:
#	system/phrasesupdate.php
2025-03-20 13:29:49 +01:00
Cristina 2a4f1af69f Added phrase lizenzkategorie to Softwarebereitstellung app 2025-03-20 11:41:47 +01:00
Cristina b8417869b5 Added phrase lizenzkategorie to Softwarebereitstellung app 2025-03-20 11:18:26 +01:00
Harald Bamberger 129637cf4f add phrases for lvdev overviews 2025-03-12 12:05:34 +01:00
Cristina ed2f895d8b Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite 2025-03-11 17:35:34 +01:00
Cristina eedbab21a2 Added phrases for Softwarebereitstellung 2025-03-06 09:58:15 +01:00
Cristina 3a83d468ef Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite 2025-03-06 09:50:55 +01:00
ma0048 11ba9c9911 Merge branch 'refs/heads/feature-55289/pep_fine_tuning' into pep_deploy_2025_03_06
# Conflicts:
#	system/dbupdate_3.4.php
2025-03-05 15:15:57 +01:00
ma0048 f942836453 Merge remote-tracking branch 'origin/feature-54945/filtercomponent_custom_headerfilter_datum' into pep_deploy_2025_03_06
# Conflicts:
#	public/js/tabulator/filters/defaultHeaderFilter.js
2025-03-05 15:14:49 +01:00
Alexei Karpenko 2cbbcc9039 changed Projektarbeitsbeurteilung phrase 2025-03-05 14:52:55 +01:00
ma0068 1944152d13 redesign dropdown mobility-properties with overriding filtercomopnent actions 2025-03-03 16:40:05 +01:00
ma0068 20fc528107 Use Modal for Mobility Tab 2025-03-03 15:10:01 +01:00
Alexei Karpenko a63c321f97 added Projektarbeitsbeurteilung phrases 2025-02-28 12:09:26 +01:00
ma0048 737c9937c9 - namen bei tags
- phrasen hinzugefuegt
2025-02-27 09:07:23 +01:00
ma0048 30c4245861 - international skills -> diplomasupp
- notenuebernahme mail
- student uebersicht ueberarbeitet
- phrases angepasst
2025-02-27 08:35:05 +01:00
ma0048 ab20943493 - filter aus dem defaultfilter entfernt
- tagfilter hinzugefuegt
- clear filter hinzugefuegt
- persistence default auf false gesetzt
2025-02-24 08:58:35 +01:00
Harald Bamberger 11e8ffb22c Merge branch 'feature-25999/C4_cleanup' into merge_FHC4_C4 2025-02-19 14:25:04 +01:00
Johann Hoffmann cb42ba110e adapt new calendar url format for rauminfo page; readded vue router dashboard fallback since there are possible url combinations that can not be resolved properly; 2025-02-18 16:31:05 +01:00
Alexei Karpenko 7083955702 changed Proektarbeitsbeurteilung phrases 2025-02-14 16:44:33 +01:00
Harald Bamberger 48ef35c0e9 Merge branch 'feature-25999/C4_cleanup' into merge_FHC4_C4 2025-02-14 14:58:46 +01:00