ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev

pushover
Moe 2019-08-08 17:49:53 -07:00
parent 9e275b999e 00e0fb5df3
commit cb4708d1d5
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/libs/js/dash2.elements.js
View File

@ -493,6 +493,7 @@ $(document).ready(function(e){
center: 'title',
right: 'month,agendaWeek,agendaDay,listWeek'
},
locale: user.details.lang.substring(0, 2),
defaultDate: $.ccio.timeObject(d.videos[0].time).format('YYYY-MM-DD'),
navLinks: true,
eventLimit: true,

1
web/pages/home.ejs
View File

@ -214,6 +214,7 @@
<script src="<%-window.libURL%>libs/js/bootstrap-table.min.js"></script>
<script src="<%-window.libURL%>libs/js/socket.io.js"></script>
<script src="<%-window.libURL%>libs/js/fullcalendar.min.js"></script>
<script src="<%-window.libURL%>libs/js/locale-all.js"></script>
<script src="<%-window.libURL%>libs/js/hls.min.js"></script>
<script src="<%-window.libURL%>libs/js/libde265.min.js"></script>
<script src="<%-window.libURL%>libs/js/bootstrap-slider.min.js"></script>

1
web/pages/super.ejs
View File

@ -26,6 +26,7 @@
<script src="<%-window.libURL%>libs/js/pnotify.custom.min.js"></script>
<script src="<%-window.libURL%>libs/js/popper.min.js" type="text/javascript"></script>
<script src="<%-window.libURL%>libs/js/bootstrap4.min.js" type="text/javascript"></script>
<script src="<%-window.libURL%>libs/js/dash2.confirm.js" type="text/javascript"></script>
<style>
.form-group label>div:first-child{width:40%}
.list-group li .form-group {margin:0}