 Johann Hoffmann
|
283865aa32
|
Merge remote-tracking branch 'origin/feature-76994/EntEditByStudentErrorFix' into feature-77588/AnwesenheitenSprint252
# Conflicts:
# system/phrasesupdate.php
|
2026-09-28 11:26:11 +02:00 |
|
|
Harald Bamberger
|
50951dfdcf
|
anrechnungen: add pdf file extension to content disposition filename
|
2026-09-22 13:00:28 +02:00 |
|
|
Johann Hoffmann
|
6d9ce91302
|
Merge remote-tracking branch 'origin/master' into feature-77588/AnwesenheitenSprint252
# Conflicts:
# system/phrasesupdate.php
|
2026-08-26 16:31:28 +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 |
|
|
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 |
|
|
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 |
|
|
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
|
cd87ecc2d9
|
fix assign batchUser
|
2026-08-06 15:00:35 +02:00 |
|
|
Harald Bamberger
|
9f68fe6b3b
|
Merge branch 'feature-77973/StudVw-Feedback_Finetuning_bhmod' into studvw_lvvw_2026_08_rc
|
2026-08-03 11:18:34 +02:00 |
|
|
Harald Bamberger
|
7c9f6d89d6
|
move setting index_bezeichnung_mehrsprachig to StudentListLib
|
2026-08-03 10:43:53 +02:00 |
|
|
Harald Bamberger
|
3d728fd884
|
Merge branch 'master' into studvw_lvvw_2026_08_rc
|
2026-07-31 15:51:35 +02:00 |
|
|
chfhtw
|
2b4aef5633
|
Merge branch 'feature-77417/studvw-tags-formatter-and-header-filter' into studvw_lvvw_2026_08_rc
|
2026-07-31 12:52:29 +02:00 |
|
|
Harald Bamberger
|
b9d4aefd5e
|
add meta info
|
2026-07-31 11:02:46 +02:00 |
|
|
Harald Bamberger
|
69048f8f48
|
bugfix semester calculation between semesters
|
2026-07-31 09:51:04 +02:00 |
|
|
ma0048
|
0ef905c6f2
|
use language index
|
2026-07-29 11:15:24 +02:00 |
|
|
ma0048
|
4e16220da1
|
Merge remote-tracking branch 'origin/feature-75959/StudVw_Automatische_Tags' into studvw_lvvw_2026_08_rc
# Conflicts:
# application/controllers/api/frontend/v1/stv/Students.php
|
2026-07-29 09:53:48 +02:00 |
|
|
Harald Bamberger
|
aa52c32d40
|
Merge branch 'feature-77372/lv_verwaltung_release_fine_tuning' into studvw_lvvw_2026_08_rc
|
2026-07-28 15:50:06 +02:00 |
|
|
Harald Bamberger
|
02a97fb0e2
|
Merge branch 'feature-76160/StudVw_Verbandsbaum_durch_Extensions_erweiterbar_machen' into studvw_2026_08_rc
|
2026-07-28 15:35:54 +02:00 |
|
|
chfhtw
|
c83674fc41
|
StudentListLib: store where clauses and add it in later in execute function to prevent errors like in Task:78115
|
2026-07-23 15:05:11 +02:00 |
|
|
chfhtw
|
ae56a4f2ed
|
Move LvVerwaltung treemenu config to config file and disable groups & verband per default
|
2026-07-21 14:57:41 +02:00 |
|
|
ma0068
|
7cda22f807
|
use language index for tags
|
2026-07-21 10:41:27 +02:00 |
|
|
ma0068
|
68292b60af
|
add Tags Incoming and Preabbrecher
|
2026-07-20 17:36:54 +02:00 |
|
|
Johann Hoffmann
|
04d90f53d3
|
adapt stundeplanlib expandObjectInformation when called by getEventsEmployee with an event called extendStundenplanData, which allows extensions like digi anw to plant their own data object inside the stundenplan events in order to conditionally render something like currently in the lehreinheiten calendarEvent.js renderer -> parameterized link to anw extension in order to avoid duplicating functionality across widgets when there is already one doing it very well;
|
2026-07-20 16:40:57 +02:00 |
|
|
chfhtw
|
65e76e951a
|
Translate treemenu entries
|
2026-07-17 12:01:17 +02:00 |
|
|
ma0048
|
e9312dfbb3
|
lvverwaltung new release
|
2026-07-15 11:35:37 +02:00 |
|
|
chfhtw
|
52c90111cc
|
Add treemenu to lvverwaltung
|
2026-07-15 11:01:03 +02:00 |
|
|
ma0048
|
a2d10ae09d
|
Merge remote-tracking branch 'origin/feature-69454/lvverwaltung_karteireiter_lv_termine' into feature-77372/lv_verwaltung_release_fine_tuning
# Conflicts:
# application/controllers/api/frontend/v1/LvPlan.php
# public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
|
2026-07-15 09:32:03 +02:00 |
|
|
ma0048
|
c233902fe2
|
Merge remote-tracking branch 'origin/feature-70746/lvverwaltung_lektorentausch' into feature-77372/lv_verwaltung_release_fine_tuning
# Conflicts:
# application/libraries/LektorLib.php
|
2026-07-15 09:20:57 +02:00 |
|
|
ma0048
|
29738b6690
|
Merge remote-tracking branch 'origin/feature-69353/lv_verwaltung_stundensatz_auf_leer_setzen_geht_nicht' into feature-77372/lv_verwaltung_release_fine_tuning
|
2026-07-15 09:17:19 +02:00 |
|
|
Alexei Karpenko
|
c5c29df6cc
|
Gehaltsbestandteil, Gehaltsbestandteil_model: added gehaltstyp_bezeichnung
|
2026-07-14 20:51:41 +02:00 |
|
|
chfhtw
|
0b1d0fbe4c
|
Merge branch 'master' into feature-76160/StudVw_Verbandsbaum_durch_Extensions_erweiterbar_machen
|
2026-07-14 14:31:51 +02:00 |
|
|
Harald Bamberger
|
f8d8d501ca
|
Merge branch 'studvw_2026_05_rc_tags' into feature-77537/Studvw_Feedback
|
2026-07-13 14:42:54 +02:00 |
|
|
Harald Bamberger
|
7e6d670d82
|
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
|
2026-07-13 14:32:51 +02:00 |
|
|
chfhtw
|
4424c7d748
|
Handle "incoming" menu entry (in inout and prestudent filters)
|
2026-07-13 13:03:23 +02:00 |
|
|
chfhtw
|
d436d8cb20
|
Check permissions for prestudent menu entry
|
2026-07-13 13:02:40 +02:00 |
|
|
Harald Bamberger
|
b5e65cf072
|
Merge branch 'master' into studvw_2026_05_rc
|
2026-07-08 16:42:04 +02:00 |
|
|
Harald Bamberger
|
e4f43cc820
|
Merge branch 'master' into feature/76981-missing-mailing-lists
|
2026-07-08 14:15:40 +02:00 |
|
|
chfhtw
|
b991bbd9a5
|
Allow extra columns for studvw student list
|
2026-07-08 11:00:20 +02:00 |
|
|
chfhtw
|
5bed848aae
|
Merge branch 'master' into feature-76160/StudVw_Verbandsbaum_durch_Extensions_erweiterbar_machen
|
2026-07-08 09:43:58 +02:00 |
|
|
Ivymaster
|
6c550372a3
|
add definable tag column in modified helpers
|
2026-07-07 15:49:16 +02:00 |
|