Commit Graph

16742 Commits

Author SHA1 Message Date
ma0048 8623a4e569 Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into demo 2025-07-17 16:22:19 +02:00
ma0048 9fa23a1471 fixed check permission 2025-07-17 16:21:23 +02:00
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 5bda4db592 unr beim kopieren setzen
gruppen anzeige direktinskription rausgefillert
datatree aufklappen bug gefixed
kurzbz bei den icons statt eigene spalte
2025-07-11 07:33:10 +02:00
ma0048 7bd0b39f77 resetting currentTreeLevel 2025-07-07 11:14:02 +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 a904328aaf Revert "Added getTemplateLvTree method to Lehrveranstaltung_model.php"
This reverts commit f3d768bfdd.
2025-07-03 11:09:40 +02:00
Johann Hoffmann 74b1640a52 Merge branch 'feature-61592/AnwesenheitenFinetuning' into demo 2025-07-02 15:27:17 +02:00
Cris f3d768bfdd Added getTemplateLvTree method to Lehrveranstaltung_model.php
This method gets all Templates and unions with all Lehrveranstaltungen of given Studiensemester and Oes, that are assigned to
a template. This data structure can be used for nested tabulator data tree.
2025-07-02 15:25:25 +02:00
Johann Hoffmann af9ff4dbc8 merge; 2025-07-02 15:25:25 +02:00
ma0048 0cfaf32956 - nicht gestartete gebiete markieren 2025-07-02 15:25:25 +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 fee0037eec Merge branch 'feature-55978/infocenter_electronic_onboarding_filter' into demo 2025-06-16 11:37:33 +02:00
Andreas Österreicher 02df06288e Bugfix Rückstellgrund 2025-06-16 11:37:04 +02:00
Andreas Österreicher ce47579870 Merge branch 'master' into feature-55978/infocenter_electronic_onboarding_filter 2025-06-16 11:35:49 +02:00
Andreas Österreicher 6c99571096 Merge branch 'feature-55978/infocenter_electronic_onboarding_filter' into demo 2025-06-16 11:22:52 +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
kindlm 45b9bae0b0 Merge remote-tracking branch 'origin/master' 2025-06-11 13:40:01 +02:00
kindlm 77ccfa46de Task #62440 Ampelsystem Benutzercount 2025-06-11 13:39:50 +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 a52fcf1570 Merge branch 'feature-61601/Issue_Liste_hartcoded_eingeschraenkt' 2025-05-26 13:00:23 +02:00
Alexei Karpenko 5d241b050a issue list: renamed config 2025-05-26 11:16:50 +02:00
Alexei Karpenko 660f195c57 issue list: removed empty space and removed const which was moved to config 2025-05-26 11:03:33 +02:00
Andreas Österreicher 9b0e0fe135 Merge branch 'feature-61751/infocenter_absage_fuer_alle' 2025-05-26 10:59:38 +02:00
Andreas Österreicher 867afa4411 Merge branch 'master' into feature-61751/infocenter_absage_fuer_alle 2025-05-26 10:41:40 +02:00
Alexei Karpenko 94f0d43c4a issues config: removed empty lines 2025-05-23 09:59:13 +02:00
Alexei Karpenko 80faf92dc2 made issue list configurable (apps, status, functions) 2025-05-22 18:41:26 +02:00
Johann Hoffmann 12ca915b00 ddi/ddo text in legende old anw liste; studentdropdown order changed; email datumformat d.m.y; 2025-05-21 18:16:01 +02:00
Cristina c3e978b56e Adapted Input.js radio/checkbox label to accept HTML 2025-05-21 18:10:03 +02:00
Cristina 7e83df51a8 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2025-05-21 18:05:40 +02:00
Andreas Österreicher d677cee1f9 Merge branch 'feature-56330/Digi-Anw-Feedback' 2025-05-21 15:27:31 +02:00
Andreas Österreicher 8786b60c4c Merge branch 'master' into feature-56330/Digi-Anw-Feedback 2025-05-21 14:11:50 +02:00
Andreas Österreicher 9b9351fe9b Merge branch 'bug-62088/dummy_std_beim_reinziehen_im_fas_zu_einer_lv_kommt_eine_fehlermeldung_130_std_und_zuordnung_funktioniert_nicht' 2025-05-21 10:49:49 +02:00
ma0048 02701dc0c5 fixed bug stundengrenze hinweis beim hinzufuegen eines dummy lektors 2025-05-21 10:47:55 +02:00
Harald Bamberger e9a373afb8 Merge branch 'feature-61758/stv_kontakte_get_funktionen_null_abfangen' 2025-05-21 07:11:18 +02:00
Harald Bamberger 1222d33e6e Merge branch 'master' into feature-61758/stv_kontakte_get_funktionen_null_abfangen 2025-05-21 07:10:47 +02:00