blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-10-12 15:04:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,488 Commits 238 Branches 7 Tags
feature-78218/optimize-memory-usage
Commit Graph
5330 Commits
Author SHA1 Message Date
Ivymaster 63af8efb44 Conflict resolved 2026-09-07 18:00:00 +02:00
Ivymaster 02ff8d0e3c Conflicts resolved 2026-09-02 15:01:56 +02:00
ma0048 90f62a7a9e - merged master 
- added raumvorschlag slots
 2026-09-02 10:54:36 +02:00
Ivymaster 669e03b915 Conflicts resolved 2026-09-01 13:19:17 +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 1d61652b67 Merge remote-tracking branch 'origin/feature-78211/tempus_kollisionscheck_auf_lehreinheit_id_umbauen_' into feature-68298/Tempus_Grundstruktur 
# Conflicts:
#	application/libraries/KalenderLib.php
 2026-09-01 12:59:22 +02:00
ma0048 8a448fde3c Merge remote-tracking branch 'origin/feature-78288/tempus_usability' into feature-68298/Tempus_Grundstruktur 
# Conflicts:
#	public/css/components/horizontalsplit.css
#	public/js/components/Tempus/Filters/searchbarOptions.js
 2026-09-01 12:48:07 +02:00
ma0048 1361c3fc00 Merge remote-tracking branch 'origin/feature-78286/tempus_berechtigungen' into feature-68298/Tempus_Grundstruktur 
# Conflicts:
#	application/controllers/api/frontend/v1/tempus/Coursepicker.php
#	application/libraries/KalenderLib.php
 2026-09-01 12:42:16 +02:00
ma0048 d727012806 Merge remote-tracking branch 'origin/feature-78285/tempus_stundenraster_ausschalten_nur_mit_eigener_berechtigung' into feature-68298/Tempus_Grundstruktur 
# Conflicts:
#	system/dbupdate_3.4.php
 2026-09-01 12:32:38 +02:00
ma0048 b91ba9fdbb Merge remote-tracking branch 'origin/feature-78324/tempus_coursepicker_lektor' into feature-68298/Tempus_Grundstruktur 
# Conflicts:
#	application/controllers/api/frontend/v1/tempus/Coursepicker.php
#	public/js/components/Tempus/Coursepicker.js
 2026-09-01 12:28:32 +02:00
ma0048 357a51bdcb Merge remote-tracking branch 'origin/feature-78317/tempus_delete_status' into feature-68298/Tempus_Grundstruktur 2026-09-01 12:21:53 +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 fb36b2a548 - merged master 
- updaed Verbandsbaum to work with the new version
 2026-08-31 14:58:27 +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 98be0b43b7 - permissions geandert 2026-08-27 08:08:34 +02:00
ma0048 4cbf37d727 - ueberpruefung der berechtigung auf den studiengang von der lv beim verschieben/hinzufuegen/loeschen der lehreinheit 2026-08-27 08:07:39 +02:00
ma0048 623e8007b0 - sichtbarkeitsstatus hinzugefuegt 
- tage ausblendbar
- lektor zur lvverwaltung verlinkt
- vertical splitter hinzugefuegt
- anzahl der einheiten hinzugefuegt
 2026-08-26 09:01:47 +02:00
Harald Bamberger 6d641bbd06 pass in uid by reference 2026-08-24 13:56:55 +02:00
Harald Bamberger f84d12277d remove debug code 2026-08-24 07:31:47 +02:00
Harald Bamberger 9bf5bc2ad9 more generic bugfix, to use studentlehrverband only with date_range for the same studiensemester_kurzbz 2026-08-24 07:26:12 +02:00
Harald Bamberger 75d2cabdbe bugfix lv-plan 2026-08-20 15:10:26 +02:00
Harald Bamberger 7f3b4100ab Merge branch 'master' into feature-78257/StudVW_Und_Tags_Finetuning 2026-08-19 15:07:07 +02:00
Cristina 0f843db33d Merge branch 'master' into epic/LVEvaluierung-Neu 2026-08-19 13:34:53 +02:00
Harald Bamberger 55a6ec9d0d fix handling of grundbetrag and betrag_valorisiert 2026-08-19 11:48:22 +02:00
Harald Bamberger 8d9113d5c8 Merge branch 'master' into feature-77666/Details_anzeigen_der_Valorisierung_pro_Person 2026-08-19 08:06:16 +02:00
Harald Bamberger 7ce81ad4bd Merge branch 'feature-78292/dv_gehaltsbestandteil_ersteinstufung' 2026-08-19 07:57:07 +02:00
Cristina 5e15d4b219 Add Distinct to getLeitung in Studiengang_model.php 
Avoid multiple records for same active STGL.
e.g. double entries
 2026-08-18 16:51:39 +02:00
Harald Bamberger 92d27fc242 Merge branch 'master' into feature/78128-quick-copy-full-name-and-title 2026-08-18 14:52:41 +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
ma0068 afb8011347 bugfix manual rebuilding of Tag ZGV Missing 2026-08-13 12:57:49 +02:00
Harald Bamberger 6d5a4531e1 use tbl_studentlehrverband.semester instead of tbl_student.semester 2026-08-12 16:58:21 +02:00
ma0068 15beaa9be8 Merge branch 'feature-78257/StudVW_Und_Tags_Finetuning' of github.com:FH-Complete/FHC-Core into feature-78257/StudVW_Und_Tags_Finetuning 2026-08-12 12:42:10 +02:00
ma0068 574057da88 add masterzgv to CoremissingZgvLib 2026-08-12 12:41:39 +02:00
Harald Bamberger c81b5338de Merge branch 'master' into feature-78292/dv_gehaltsbestandteil_ersteinstufung 2026-08-12 11:39:49 +02:00
ma0048 b2aa4c4922 stundenraster mit eigener berechtigung basis/tempus_stundenraster deaktivierbar 2026-08-12 11:39:17 +02:00
ma0048 33b50bf479 course picker 
- kurse vom lektor koennen angezeigt werden
- searchbar button hinzuefuegt um kurse vom lektor im course picker zu laden
 2026-08-12 11:10:07 +02:00
chfhtw dd410a74ba Add missing routes for StudVw 2026-08-12 10:14:02 +02:00
chfhtw 30c4e565dd bugfix: sprache index in studentlistlib corrected 2026-08-11 15:08:34 +02:00
ma0048 015c8ca0f1 kollisionscheck auf lehreinheit_id umgebaut 
raumvorschlag by lehreinheit hinzuegfuegt
 2026-08-11 11:48:29 +02:00
Werner Masik d66fe72cc9 add field for salary adaption type (Ersteinstufung, indiv. Erhöhung, ..) 2026-08-11 11:18:36 +02:00
Harald Bamberger 10218305db Merge branch 'bug-78116/StudStatus_sendStglSammelmail_empty_list' 2026-08-11 10:40:26 +02:00
ma0068 31bae9b693 use function getStgAndDetails instead of getStgAndSem 2026-08-11 09:48:17 +02:00
adisposkofh 59ac56374e removed redundant response meta used for dev 2026-08-11 09:44:41 +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 9f0b387ab6 use phrase ui/cancel instead of ui/abbrechen 2026-08-11 09:21:48 +02:00
Harald Bamberger 3a97f20122 add v-bind syntax to avoid prop type warning 2026-08-11 09:08:32 +02:00
Harald Bamberger 046a552f34 Merge branch 'master' into feature-76995/StudStatusModal_Hinweis_Beratungsgespraech_bei_Abmeldung 2026-08-11 08:11:55 +02:00
Harald Bamberger e8a534f0fe Cis MyLv Endpoints only require logged in user 2026-08-11 07:52:02 +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