 Harald Bamberger
|
1f36a08f05
|
Merge branch 'merge_37107_37133_39212'
|
2024-06-19 11:41:11 +02:00 |
|
|
Harald Bamberger
|
ea9c35a64b
|
Merge branch 'feature-37107/Fristenmanagement' into merge_37107_37133_39212
|
2024-06-19 10:28:39 +02:00 |
|
|
Harald Bamberger
|
04c006a733
|
do not create dummy manual events
|
2024-06-19 10:28:03 +02:00 |
|
|
Harald Bamberger
|
aff1f9126f
|
Merge branch 'master' into merge_37107_37133_39212
|
2024-06-19 09:45:05 +02:00 |
|
|
Andreas Österreicher
|
fb77ab67e7
|
Prüfungshonorare im Notenkarteireiter zeigen nur aktive Mitarbeiter an
|
2024-06-19 09:05:08 +02:00 |
|
|
Harald Bamberger
|
d3a277f9fb
|
Merge branch 'feature-39212/PV21-Grund_beim_Beenden_eines_DV' into merge_37107_37133_39212
|
2024-06-19 08:52:03 +02:00 |
|
|
Harald Bamberger
|
0aa53f64ff
|
db Aenderungen Gegenpruefung hinzugefuegt
|
2024-06-19 08:51:34 +02:00 |
|
|
Harald Bamberger
|
e05fa0f4d8
|
Merge branch 'master' into merge_37107_37133_39212
|
2024-06-14 11:50:32 +02:00 |
|
|
Harald Bamberger
|
c3278ad30f
|
add app softwarebereitstellung to prevent checksystem errors when adding phrases for softwarebereitstellung while not having installed the extension
|
2024-06-14 11:49:43 +02:00 |
|
|
Harald Bamberger
|
e4326e00e4
|
Merge branch 'feature-39212/PV21-Grund_beim_Beenden_eines_DV' into merge_37107_37133_39212
|
2024-06-14 11:02:25 +02:00 |
|
|
Harald Bamberger
|
93d0f88b0d
|
function getDVByPersonUID: add dvendegrund_kurzbz and dvendegrund_anmerkung to select
|
2024-06-14 10:48:43 +02:00 |
|
|
Harald Bamberger
|
1c385d22cd
|
Merge branch 'feature-37133/Gehaltsbaender' into merge_37107_37133_39212
|
2024-06-14 10:41:48 +02:00 |
|
|
Harald Bamberger
|
24786c6ae6
|
Merge branch 'feature-37107/Fristenmanagement' into merge_37107_37133_39212
|
2024-06-13 13:30:38 +02:00 |
|
|
Harald Bamberger
|
0e5d4b30ed
|
Merge branch 'master' into feature-37133/Gehaltsbaender
|
2024-06-13 13:26:48 +02:00 |
|
|
Harald Bamberger
|
4e233f760d
|
Merge branch 'master' into feature-37107/Fristenmanagement
|
2024-06-13 13:26:02 +02:00 |
|
|
Harald Bamberger
|
fd2474cc38
|
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
|
2024-06-13 11:51:10 +02:00 |
|
|
Andreas Österreicher
|
20eee62c19
|
Merge branch 'sonstiges-40279/SWB-Lizenzserverport'
|
2024-06-13 11:13:30 +02:00 |
|
|
Harald Bamberger
|
1e56707e5a
|
Merge branch 'feature-40415/Studstatus-UID_in_Sancho_Message_Abmeldung_StG_Ablauf_Einspruchsfrist'
|
2024-06-12 08:13:11 +02:00 |
|
|
Harald Bamberger
|
6816a300f6
|
Beschriftung korrigiert
|
2024-06-11 16:39:20 +02:00 |
|
|
Harald Bamberger
|
0b8191a435
|
Beschriftung zu IDs in Sancho Message hinzugefuegt
|
2024-06-11 16:26:52 +02:00 |
|
|
Harald Bamberger
|
f8d8a44a3c
|
student_uid zu sancho message Abmeldung StG Ablauf Einspruchsfrist
|
2024-06-11 14:47:54 +02:00 |
|
|
Cris
|
cd0eacf947
|
Updated phrases: Added phrases 'lizenzserverPort' and 'raumSwZuordnung'
|
2024-06-11 13:52:03 +02:00 |
|
|
Cris
|
dd47cd2a7c
|
Updated filter: Added lizenzserver_kurzbz and lizenzserver_port to SoftwareManagement filter
|
2024-06-11 13:51:03 +02:00 |
|
|
Cris
|
a4b77fc43f
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2024-06-11 11:32:47 +02:00 |
|
|
Andreas Österreicher
|
f943ae7566
|
Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software'
|
2024-06-10 14:05:49 +02:00 |
|
|
Cris
|
f1547b069d
|
Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' of https://github.com/FH-Complete/FHC-Core into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
|
2024-06-10 13:37:46 +02:00 |
|
|
Cris
|
ac7dc1599c
|
Corrected path to init.js.php
|
2024-06-10 13:37:14 +02:00 |
|
|
Andreas Österreicher
|
46b7dc1ce7
|
Dauer für die Anzeige von abgelaufenen Projekten in der Zeitaufzeichnung
auf 2 Monate verlängert
|
2024-06-07 10:19:12 +02:00 |
|
|
Cris
|
125a2da9b3
|
Merge branch 'feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software' of https://github.com/FH-Complete/FHC-Core into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
|
2024-06-04 16:16:49 +02:00 |
|
|
Cris
|
884d930e71
|
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
|
2024-06-04 16:05:33 +02:00 |
|
|
Cris
|
49045c06af
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2024-06-04 16:04:19 +02:00 |
|
|
Harald Bamberger
|
7b148b1a39
|
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
|
2024-06-03 17:21:50 +02:00 |
|
|
Harald Bamberger
|
0cbb8997e2
|
migratecontract config und config check auch in MigrateHourlyRate verwenden
|
2024-06-03 17:14:55 +02:00 |
|
|
Cris
|
512002c0e8
|
Created init.js file and changed link url in stpl_week to open Software-Raumsuche by OrtKurzbz
|
2024-06-03 16:40:35 +02:00 |
|
|
Cris
|
9652f48044
|
Added phrases 'zugeklappt', 'softwareliste', 'raumverfuegbarkeit'
|
2024-06-03 16:27:31 +02:00 |
|
|
Andreas Österreicher
|
5453579c7b
|
Merge branch 'feature-36963/BIS_check_duales_Studium'
|
2024-05-28 09:29:44 +02:00 |
|
|
KarpAlex
|
d8ba92e343
|
Merge branch 'master' into feature-36963/BIS_check_duales_Studium
|
2024-05-27 19:42:48 +02:00 |
|
|
cgfhtw
|
d5e8227918
|
Bugfix: api/frontend/fas controller do not inherit from FHCAPI_Controller
|
2024-05-27 12:45:10 +02:00 |
|
|
Harald Bamberger
|
8cba0aec5a
|
vertragsarten dvbund, dvanderegk und dvanderebet hinzugefuegt, MigrateContract default oe und ba1code mapping in config verschoben und config check implementiert
|
2024-05-22 15:32:28 +02:00 |
|
|
Cris
|
aab198e355
|
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
|
2024-05-22 11:03:34 +02:00 |
|
|
Cris
|
559a6b317d
|
Fixed multiple display of child software
|
2024-05-21 14:44:41 +02:00 |
|
|
Cris
|
66a80697c2
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2024-05-21 14:21:34 +02:00 |
|
|
Werner Masik
|
706dad6df6
|
added DV Ende
|
2024-05-16 21:58:34 +02:00 |
|
|
Harald Bamberger
|
f2a2469e6e
|
MigrateContract: keine ZeitaufzeichnungsVbs erstellen wenn za oder azg flag null ist. MigrateHourlyRate: kalkulatorische Stundensaetze nur migrieren wenn SAP Sync Tabelle existiert.
|
2024-05-15 17:25:26 +02:00 |
|
|
Cris
|
c4c17f69c7
|
Added phrase softwaretypKurzbz
|
2024-05-14 13:41:33 +02:00 |
|
|
Cris
|
8a0d2a2f10
|
Refactored Tabs title assignment to utilize computed property
This is necessary to render language phrases correctly
|
2024-05-13 14:02:05 +02:00 |
|
|
Cris
|
6d728ae0e7
|
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
# public/js/components/Tabs.js
# public/js/components/filter/Filter.js
|
2024-05-13 12:07:37 +02:00 |
|
|
Cris
|
58f52dfaae
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2024-05-13 11:07:16 +02:00 |
|
|
Cris
|
5643607845
|
Added phrases 'statusErfolgreichUebertragen' and 'statusUebertragenMsg' to Softwarebereitstellung app
|
2024-05-13 11:06:32 +02:00 |
|
|
Harald Bamberger
|
93b111af93
|
fix handleSystemError is not a function
|
2024-05-06 16:48:38 +02:00 |
|