Johann Hoffmann
9a3532265f
information schema guard check for the data migration & table alter statements aswell, so they dont run on every checksystem.php invocation
2026-09-10 11:50:51 +02:00
Andreas Österreicher
e32691994c
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
2026-08-26 08:21:30 +02:00
Harald Bamberger
6d641bbd06
pass in uid by reference
2026-08-24 13:56:55 +02:00
Harald Bamberger
3455aed3f5
Merge branch 'bhdev_master_stundenplan'
2026-08-24 13:46:09 +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
27765606e3
bufix akadGrad by sex if exists
2026-08-20 19:31:37 +02:00
Harald Bamberger
75d2cabdbe
bugfix lv-plan
2026-08-20 15:10:26 +02:00
Harald Bamberger
bae9d6d9a0
Merge branch 'feature-78257/StudVW_Und_Tags_Finetuning'
2026-08-19 17:11:12 +02:00
Harald Bamberger
43d6a882ce
add padding to tags buttons, remove orphanded template closing tag
2026-08-19 17:07:25 +02:00
Harald Bamberger
7f3b4100ab
Merge branch 'master' into feature-78257/StudVW_Und_Tags_Finetuning
2026-08-19 15:07:07 +02:00
Harald Bamberger
9f54ecce54
Merge branch 'epic/LVEvaluierung-Neu'
2026-08-19 13:59:00 +02:00
Cristina
7af0f4a478
Merge remote-tracking branch 'origin/epic/LVEvaluierung-Neu' into epic/LVEvaluierung-Neu
2026-08-19 13:35:25 +02:00
Cristina
0f843db33d
Merge branch 'master' into epic/LVEvaluierung-Neu
2026-08-19 13:34:53 +02:00
Cristina
3e59648d5b
Merge branch 'master' into epic/LVEvaluierung-Neu
2026-08-19 12:55:38 +02:00
Cristina
5923991848
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2026-08-19 12:55:03 +02:00
Harald Bamberger
55a6ec9d0d
fix handling of grundbetrag and betrag_valorisiert
2026-08-19 11:48:22 +02:00
chfhtw
78505589c8
Bugfix: racecondition renderers
2026-08-19 09:45:15 +02:00
Harald Bamberger
0e985113ec
Merge branch 'feature-77666/Details_anzeigen_der_Valorisierung_pro_Person'
2026-08-19 08:20:42 +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
Harald Bamberger
ea56ec8daa
change wording
2026-08-19 07:50:50 +02:00
Harald Bamberger
bf5ee2f64b
Merge branch 'feature-78139/CIS4_Dashboard_ausgeblendete_Widgets'
2026-08-18 17:51:40 +02:00
Harald Bamberger
55d6d90fa6
Merge branch 'master' into feature-78139/CIS4_Dashboard_ausgeblendete_Widgets
2026-08-18 17:47:13 +02:00
Harald Bamberger
6adc55a843
Merge branch 'feature/78128-quick-copy-full-name-and-title'
2026-08-18 17:39:44 +02:00
Harald Bamberger
52c1fba17b
Merge branch 'bugfix/78127-degree-programs-page-localization-ineffective'
2026-08-18 16:53:49 +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
00954f680b
Merge branch 'bugfix/78392-missing-searchbar-is-mobile-injectable'
2026-08-18 16:48:43 +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
Harald Bamberger
f6bb27cdb0
Merge branch 'master' into bugfix/78127-degree-programs-page-localization-ineffective
2026-08-18 14:49:16 +02:00
Harald Bamberger
558963cd74
Merge branch 'master' into feature-78139/CIS4_Dashboard_ausgeblendete_Widgets
2026-08-18 14:42:44 +02:00
Harald Bamberger
0b5c0f27a5
Merge branch 'bugfix/77738-persisting-lv-menu'
2026-08-14 11:58:42 +02:00
adisposkofh
f846bb221a
refetching lv menu after a different calendar event is selected
2026-08-14 11:47:31 +02:00
Werner Masik
d8355ba3f5
added Funktionsänderung to gehaltsanpassungtyp
2026-08-13 14:56:04 +02:00
ma0068
afb8011347
bugfix manual rebuilding of Tag ZGV Missing
2026-08-13 12:57:49 +02:00
Johann Hoffmann
46f8d0d07d
remove all remaining projektarbeit-lehreinheit joins across the codebase;
...
master merge reverted the LE removal in Projektarbeit_model -> re-applied that fix and went through every file that touches tbl_projektarbeit to find remaining issues.
Projektarbeit_model, stv Projektarbeit controller, Vertrag_model, vertrag.class, lehrauftragsliste_gst.xls.php, zeitaufzeichnung.class.php, sammelzeugnis.rdf.php, zeugnis.rdf.php, projektarbeit.rdf.php,
lehrauftrag.xml.php, personal_lektorenohnelehrauftrag.php, personal_generateverwendung.php
tbl_lehreinheit joins remain in tbl_lehreinheitmitarbeiter contexts where lehreinheit_id is always set.
2026-08-12 18:05:45 +02:00
Harald Bamberger
6d5a4531e1
use tbl_studentlehrverband.semester instead of tbl_student.semester
2026-08-12 16:58:21 +02:00
Werner Masik
d85a3cb08f
extract DB migration for gehaltsanpassungtyp into separate file
2026-08-12 15:18:35 +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
Harald Bamberger
c433ff5c3a
remove public/vendor symlink since created by composer install
2026-08-12 11:39:16 +02:00
Harald Bamberger
ab2a0e93ed
add public/vendor to .gitignore
2026-08-12 11:38:02 +02:00
Johann Hoffmann
9274743df3
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
...
# Conflicts:
# application/controllers/api/frontend/v1/Abgabe.php
# application/controllers/api/frontend/v1/stv/Projektarbeit.php
# application/models/education/Projektarbeit_model.php
# public/css/Studentenverwaltung.css
# public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
# public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
# public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
# public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
2026-08-12 11:26:51 +02:00
Harald Bamberger
d139c4ed66
Merge branch 'bug-78432/StudVw_Baum_fehlende_Route'
2026-08-12 10:23:23 +02:00
chfhtw
dd410a74ba
Add missing routes for StudVw
2026-08-12 10:14:02 +02:00
Harald Bamberger
a5797a0bde
Merge branch 'master' into feature-78257/StudVW_Und_Tags_Finetuning
2026-08-11 18:00:17 +02:00
Harald Bamberger
5c69ede19e
Merge branch 'feature-78257/StudVW_Finetuning'
2026-08-11 17:53:06 +02:00
Harald Bamberger
a5257eb934
rearange tiles, use placeholder if uid is not set
2026-08-11 17:50:33 +02:00
Harald Bamberger
317da29376
Merge branch 'master' into feature-78257/StudVW_Finetuning
2026-08-11 16:26:36 +02:00
Johann Hoffmann