blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-24 02:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into demo

Browse Source 
# Conflicts:
#	application/models/education/Projektarbeit_model.php
#	application/views/CisRouterView/CisRouterView.php
#	public/css/Cis4/Cis.css
#	public/js/api/factory/studiensemester.js
#	public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
#	public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
#	public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
#	system/phrasesupdate.php
This commit is contained in:
ma0048
2026-04-01 11:34:28 +02:00
parent a94366d5a8 c2ce831bca
commit b6c2f2c9c9
262 changed files with 20832 additions and 5049 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/CisRouterView/CisRouterView.php
+5 -1
View File
@@ -35,7 +35,11 @@ $includesArray = array(
'vendor/npm-asset/primevue/textarea/textarea.min.js',
'vendor/moment/luxonjs/luxon.min.js',
'vendor/npm-asset/primevue/password/password.min.js',
'vendor/npm-asset/primevue/multiselect/multiselect.min.js'
'vendor/npm-asset/primevue/multiselect/multiselect.min.js',
'vendor/npm-asset/primevue/timeline/timeline.min.js',
'vendor/npm-asset/primevue/inplace/inplace.min.js',
'vendor/npm-asset/primevue/message/message.min.js',
'vendor/npm-asset/primevue/tieredmenu/tieredmenu.js',
),
'customJSModules' => array(
'public/js/apps/Dashboard/Fhc.js',