Commit Graph

14175 Commits

Author SHA1 Message Date
Cris 03e166dc89 Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
#	public/js/components/filter/Filter.js
#	public/js/plugin/FhcAlert.js
#	system/filtersupdate.php
2024-03-06 14:07:19 +01:00
Cris 0940ea77de Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-03-06 13:59:06 +01:00
Harald Bamberger 3d6b2eb202 add app fhctemplate if it does not exist 2024-03-05 17:04:43 +01:00
Harald Bamberger 5ad3510af6 add use of phrasen plugin to apps 2024-03-05 16:47:29 +01:00
Harald Bamberger d5d190777a Merge branch 'feature-34543/UX_Template' 2024-03-05 16:46:48 +01:00
Cris 7f735e9a10 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-03-05 13:05:03 +01:00
Andreas Österreicher 7524d054db Merge branch 'feature-36530/bis_internationalisierung_codextabelle_neuerungen' 2024-03-05 13:04:25 +01:00
SimonGschnell 474c4ad34f removes file that belongs to CIS_Profil 2024-03-01 10:53:06 +01:00
kindlm 621429798c Abschlussgrad in Studienblatt erst aus Studienordnung ermitteln 2024-02-29 09:50:58 +01:00
Harald Bamberger c4d4f55d06 use tabulator5 simple theme to get smaller tables 2024-02-28 18:22:35 +01:00
Andreas Österreicher a4a06507dc Merge branch 'feature-229015/SAPByD_EBCL_Buchungen_sollen_auf_eigene_Kostenstelle_zugeordnet_werden' 2024-02-28 15:08:57 +01:00
Andreas Österreicher 23b1a76190 Merge branch 'feature-36148/tdb_uebersicht_erweitert_und_job_bug' 2024-02-28 13:43:19 +01:00
Cris f94b1700e7 Renamed filter- and phrases app for Fhc-Core-Extension
Renamed from extension to fhctemplate
2024-02-28 13:38:59 +01:00
Harald Bamberger 45f2593b13 fix bug with excel showing file error when switching to editmode 2024-02-27 13:54:58 +01:00
Andreas Österreicher 4862168b8d Merge branch 'feature-36986/fas_filter_reihungstest_dual' 2024-02-26 14:49:46 +01:00
Andreas Österreicher 93f1bc752b Merge branch 'feature-36744/uebersetzungen_payments_karteireiter' 2024-02-26 12:57:18 +01:00
ma0048 aa6c5c50c2 - fas filter gefixt 2024-02-26 09:03:06 +01:00
Alexei Karpenko d9ec506c86 Codextabelle Mobilitaetsprogramm Neuerungen: changed name of some programs, set correct sichtbar and sichtbar_outgoing booleans 2024-02-23 16:54:51 +01:00
Cris 296741b584 Merge branch 'feature-34543/UX_Template' of https://github.com/FH-Complete/FHC-Core into feature-34543/UX_Template 2024-02-22 11:17:38 +01:00
Cris c232eddf89 Added filter and phrases for Fhc-Core-Extension 2024-02-22 11:17:27 +01:00
SimonGschnell 2d1e8a829d userdata changes 2024-02-21 13:50:38 +01:00
ma0048 6f92698631 - bewerbungstool payments uebersetzungen anpassungen 2024-02-20 17:01:49 +01:00
cgfhtw 72d166a050 FHCAPI Controller: multipart upload 2024-02-20 08:38:29 +01:00
KarpAlex dfe0434cce added new mobilitaetsprogramm codes 2024-02-19 17:59:20 +01:00
cgfhtw 013664db70 FhcApi Controller: new helper functions 2024-02-19 15:23:43 +01:00
cgfhtw 469b3e9833 Form Input: auto classes 2024-02-19 15:23:13 +01:00
cgfhtw 8ad2908ca9 UploadDms: Delete Button styles 2024-02-19 15:23:00 +01:00
cgfhtw 6aebbada06 Form Input: only setFeedback on last radio/checkbox in production mode 2024-02-19 10:39:18 +01:00
Andreas Österreicher e433ca3d9b Fehlende Gegenpruefungen im DB Check hinzugefuegt 2024-02-19 09:22:54 +01:00
Andreas Österreicher 7962e181df Merge branch 'feature-21620/Neues_Feld_zum_Erfassen_des_ESI' 2024-02-19 08:58:49 +01:00
Andreas Österreicher 126defadb7 Link hinzugefügt beim Zusammenlegen von Personen wenn beide Personen
UHSTAT ausgefüllt haben damit diese direkt verglichen und gelöscht
werden können.
Fehlende DB checks hinzugefügt
2024-02-16 14:59:53 +01:00
Andreas Österreicher 01c3a67762 Merge branch 'master' into feature-21620/Neues_Feld_zum_Erfassen_des_ESI 2024-02-16 14:11:02 +01:00
Andreas Österreicher cbf71a416f Deprecated Spalte Gesamtstunden aus Projektarbeitsexport entfernt 2024-02-16 11:23:20 +01:00
cgfhtw 70386a58f3 Tabs Component: removed TODOs 2024-02-16 08:53:34 +01:00
Cris caa7ad6cc4 Merge remote-tracking branch 'origin/feature-34543/UX_Template' into feature-34543/UX_Template 2024-02-15 09:54:51 +01:00
cgfhtw 3322f5115a FhcApi: Clean return value 2024-02-15 09:41:11 +01:00
cgfhtw f5b5f39689 FhcApi: return value 2024-02-14 16:00:48 +01:00
Cris 8f81426fa4 Corrected error when using alertMultiple and handleSystemMessage 2024-02-13 14:54:42 +01:00
Cris 6140e15139 Removed unused tabulatorAdditionalColumns property. Instead additional cols like 'action buttons' are now checked by index. 2024-02-13 14:53:01 +01:00
Cris acb29c5c69 Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
#	application/views/templates/FHC-Footer.php
#	composer.json
#	public/js/components/Bootstrap/Modal.js
#	public/js/components/filter/Filter.js
#	public/js/plugin/FhcAlert.js
2024-02-13 11:54:55 +01:00
Cris 91f43665fd Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2024-02-13 10:54:14 +01:00
Cris 4d8dbb2e78 Created Core BaseLayout Component 2024-02-13 10:52:11 +01:00
Cris 565f89c884 Added phrases anrechnung, geloescht and aenderungGespeichert 2024-02-13 10:51:37 +01:00
Cris e6774024b9 Merge branch 'feature-34543/UX_Template' of https://github.com/FH-Complete/FHC-Core into feature-34543/UX_Template 2024-02-12 11:25:07 +01:00
Andreas Österreicher b4d6a46426 Fixed Typo in phrase 2024-02-09 15:18:14 +01:00
Andreas Österreicher bffaea8dda Merge branch 'feature-36028/uebersetzungen_zahlungen' 2024-02-09 12:50:45 +01:00
Andreas Österreicher f5dacefbbe Merge branch 'master' into feature-36028/uebersetzungen_zahlungen 2024-02-09 12:50:00 +01:00
Andreas Österreicher 752408aa3a Fixed LineEndings 2024-02-09 12:49:14 +01:00
Andreas Österreicher e34ff8819c Merge branch 'feature-33981/testtool_text_kopieren_verhindern_erschweren' 2024-02-09 11:11:41 +01:00
cgfhtw ce9ebee57d CSS: fhc-header w/o bottom border 2024-02-09 11:10:03 +01:00