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

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into feature-25089/zeitaufzeichnung_pausencheck_6_5_stunden

Browse Source
This commit is contained in:
ma0048
2022-11-15 15:15:33 +01:00
parent 61976ed1ea 6c918be121
commit 82f577c804
277 changed files with 7018 additions and 2062 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/tools/ampelverwaltung.php
+2 -2
View File
@@ -286,9 +286,9 @@ function getActualUserAmpelData($user_ampel_arr, $semester_start)
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" type="text/css" href="../../../vendor/twbs/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../../../vendor/twbs/bootstrap3/dist/css/bootstrap.min.css">
<script type="text/javascript" src="../../../vendor/components/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/twbs/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../../../vendor/twbs/bootstrap3/dist/js/bootstrap.min.js"></script>
<title><?php echo $p->t('tools/ampelsystem') ?></title>
<!--style for sancho typewriting effect-->
cis/private/tools/zeitaufzeichnung.php
+1 -1
View File
@@ -197,7 +197,7 @@ echo '<!DOCTYPE HTML>
<link href="../../../vendor/fgelinas/timepicker/jquery.ui.timepicker.css" rel="stylesheet" type="text/css"/>
<link href="../../../skin/jquery-ui-1.9.2.custom.min.css" rel="stylesheet" type="text/css">
<script src="../../../include/js/tablesort/table.js" type="text/javascript"></script>
<script type="text/javascript" src="../../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="../../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>