Harald Bamberger
72a5f35b0e
Merge branch 'feature-62450/Studium_Phrasen' into cis40_2026-02_rc
2026-04-23 11:16:16 +02:00
Harald Bamberger
076ae15abd
Merge branch 'bug-75998/menuepunkt_fallback_wenn_die_sprache_nicht_uebereinstimmt' into cis40_2026-02_rc
2026-04-23 11:03:44 +02:00
Harald Bamberger
2dd5a95232
Merge branch 'master' into cis40_2026-02_rc
2026-04-23 10:41:41 +02:00
Harald Bamberger
954397f028
Merge branch 'feature-70376/Lohnguide'
2026-04-22 18:52:51 +02:00
Harald Bamberger
80faa61c91
Merge branch 'master' into feature-70376/Lohnguide
2026-04-22 18:46:57 +02:00
Werner Masik
961ede66a9
lohnguide db update changed
2026-04-22 18:40:22 +02:00
Andreas Österreicher
6fec8382b5
Merge branch 'feature-76554/Personalmeldung_alt_bei_Lehre_nicht_melderelevant_rausfiltern'
2026-04-22 09:15:23 +02:00
Andreas Österreicher
4eb076d115
Fixed Saving of Entwicklungsteam
2026-04-21 17:34:36 +02:00
Harald Bamberger
7427aa87ea
Merge branch 'feature-76545/findAbgabenNewOrUpdatedSinceByAbgabedatumFixTimestampDateComparison'
2026-04-21 17:01:04 +02:00
Johann Hoffmann
85043e57db
added missing parenthesis
2026-04-21 17:00:07 +02:00
Johann Hoffmann
5beddbccb4
changed the where clause to a simpler = CURRENT_DATE comparison -> works the same if the job runs daily and fetches updates of one day/date; has to be changed back in case we want to find updates in a range larger than 1 day in an interval larger than 1 day;
2026-04-21 14:18:45 +02:00
kindlm
e2ae9b88c8
Merge remote-tracking branch 'origin/master'
2026-04-21 12:56:30 +02:00
kindlm
ca3abf9154
Small Style-Fix in Testtool
...
To make headings stand out more clearly from the buttons
2026-04-21 12:56:02 +02:00
Alexei Karpenko
f863c6d728
personalmeldung legacy system: melderelevant is checked for lehre, bugfix: lehre is correctly added if studiengang already has sws
2026-04-20 18:24:30 +02:00
Harald Bamberger
1a37273a9e
Merge branch 'feature-63349/Cis_Menu_Aktiv_Flag' into cis40_2026-02_rc
2026-04-20 18:08:46 +02:00
Harald Bamberger
d14b9e2ab5
Merge branch 'feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe' into cis40_2026-02_rc
2026-04-20 18:02:23 +02:00
Harald Bamberger
d926e4165b
Merge branch 'master' into cis40_2026-02_rc
2026-04-20 17:52:24 +02:00
Harald Bamberger
8c88ae401b
Merge branch 'bug-69145/Cis4_Studiengaenge_Studentenansicht_Vertiefungen_weggefiltert' into cis40_2026-02_rc
2026-04-20 17:45:41 +02:00
Harald Bamberger
92a2053b42
Merge branch 'feature-40870/BUG_Studstatus_unpause_order_should_be_DESC'
2026-04-20 17:30:14 +02:00
Harald Bamberger
6e103480cc
Merge branch 'master' into feature-63349/Cis_Menu_Aktiv_Flag
2026-04-20 16:00:28 +02:00
Harald Bamberger
8d815d40b6
Merge branch 'master' into feature-62450/Studium_Phrasen
2026-04-20 14:49:48 +02:00
kindlm
70602be54e
SaveSort und Filter-Reset in RaumÜbersicht
2026-04-20 11:30:17 +02:00
kindlm
dac71f597a
Spalte Anmeldedatum in RT-Übersicht
...
Spalte Frage_ID in RT-Administration
JQuery und Tabelsorter aus Include in Service_Uebersicht
2026-04-20 11:24:59 +02:00
Johann Hoffmann
3a646ffe77
adapt AbgabeJob relevant queries so they compare with the pgsql date function CURRENT_DATE instead of NOW() to avoid the cutoff from uploads the happened "yesterday but more than 24 hours ago"; also added another "abgabedatum < CURRENT_DATE" condition, to avoid sending this exact case as updates 2 days in a row;
2026-04-20 11:06:06 +02:00
Harald Bamberger
98a10a2f55
Merge branch 'feature-69389/AbmeldungSTGL_Anzeige_mit_Studiengangskuerzel'
2026-04-17 12:37:49 +02:00
Harald Bamberger
e48b94b858
studiengangskuerzel statt kurzbzlang
2026-04-17 12:35:55 +02:00
adisposkofh
70ebe34f1f
merge develop into -- manual conflict resolution
2026-04-16 16:09:03 +02:00
Andreas Österreicher
0ff29ba6af
Merge branch 'epic-56039/LV-Evaluierung'
2026-04-16 13:22:40 +02:00
Harald Bamberger
ba543448ae
Merge branch 'bug-76260/StudVW_Messages_TinyMCE_Cursor_Jumping_TextInput'
2026-04-16 11:26:32 +02:00
Harald Bamberger
f121f9b5a2
deactivate pagination - since potentially msg threads are not shown completely
2026-04-16 11:23:57 +02:00
Harald Bamberger
88b22f5490
revert to v-if to not render element when not necessary and use Vue.nextTick for dependent code
2026-04-15 17:02:58 +02:00
Harald Bamberger
4b7ee9abe1
Merge branch 'feature-70376/Lohnguide'
2026-04-15 15:52:12 +02:00
Cristina
d499619cf3
Added phrase endedatumMussInZukunftLiegen
2026-04-15 13:39:06 +02:00
Cristina
f489153ff3
Merge branch 'master' into epic-56039/LV-Evaluierung
2026-04-15 12:25:05 +02:00
Cristina
9b79a07fa2
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2026-04-15 12:24:44 +02:00
adisposkofh
354e1ccdf4
reworked calendar sync appearance
2026-04-15 12:04:29 +02:00
Harald Bamberger
6ce14a25d7
Merge branch 'master' into feature-70376/Lohnguide
2026-04-15 11:49:26 +02:00
Werner Masik
c701d92779
fix db_update
2026-04-15 11:15:10 +02:00
Werner Masik
73e03ba901
Gehaltstyp Überstundenpauschale und Sachbezug PKW
2026-04-15 10:44:03 +02:00
adisposkofh
cdc279b5da
added 'other lv plan' permission check in api controller
2026-04-14 16:28:01 +02:00
adisposkofh
d003bfa7f1
code formatting
2026-04-14 15:51:37 +02:00
ma0068
95a7797ae9
delete unused apicall for mode modal
...
add editor.setContent to function getReplyData
readd loadReplyData and use v-show for visibleDiv for mode inSamePage
2026-04-14 15:46:34 +02:00
adisposkofh
343a82b89c
removed obsolete import
2026-04-14 14:53:33 +02:00
adisposkofh
cc23fb0f39
fixed issue where max_semester could not be read before a degree program was selected
2026-04-14 14:29:02 +02:00
adisposkofh
7edddd0566
removed redundant OverviewLvPlan page (same as StgOrgLvPlan)
2026-04-14 14:19:38 +02:00
adisposkofh
ebafc4576f
implemented profile calendar sync section
2026-04-14 14:08:16 +02:00
adisposkofh
7daaf79fcc
implemented permission for viewing other users' lv plans
2026-04-13 15:44:09 +02:00
adisposkofh
f1c3c8296f
implemented 'OtherLvPlan' to view other users' timetables
2026-04-13 10:41:41 +02:00
Andreas Österreicher
3a91b12f31
Merge branch 'epic-56039/LV-Evaluierung'
2026-04-13 10:39:00 +02:00
ma0068
843894405e
changes for NewDiv
...
remove Watcher for formData Fields
add predefault settings for tabulator fields
add setContent for Editor
change text for closing window/tab
show alertSuccess for sending Message just in case of inSamePage
2026-04-10 13:03:24 +02:00