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
adisposkofh
772b8c603c
fixed issue with ineffective localization of courses in 'degree programs' page
2026-08-11 15:50:24 +02:00
Cristina
37d5f2da5d
Merge branch 'master' into epic/LVEvaluierung-Neu
2026-08-11 15:45:27 +02:00
Cristina
27c39cfdca
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2026-08-11 15:45:08 +02:00
chfhtw
30c4e565dd
bugfix: sprache index in studentlistlib corrected
2026-08-11 15:08:34 +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
684d4f890a
Merge branch 'master' into feature-78257/StudVW_Finetuning
2026-08-11 10:49:05 +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
c3c23d28bb
Merge branch 'feature-76995/StudStatusModal_Hinweis_Beratungsgespraech_bei_Abmeldung'
2026-08-11 09:22:26 +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
Harald Bamberger
1f21ed7364
Merge branch 'feature-69378/Studienverlauf_verlinken_im_neuen_FAS'
2026-08-10 18:22:28 +02:00
Harald Bamberger
774a1b81c4
grades: change layout semester mode dropdown and gradelist link, details: remove css class from noImage img tag
2026-08-10 18:21:24 +02:00
Harald Bamberger
f566ea1ac3
Merge branch 'master' into feature-69378/Studienverlauf_verlinken_im_neuen_FAS
2026-08-10 18:06:00 +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
Harald Bamberger
4a92511b9b
Merge branch 'tabulator-localization-minor-fixes'
2026-08-10 17:04:31 +02:00
adisposkofh
dc5a846c10
defaulting searchbar isMobile injectable to false when not provided
2026-08-10 16:24:58 +02:00
adisposkofh
364477f0e9
merged master into
2026-08-10 15:58:21 +02:00
Harald Bamberger