ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
964 Commits
84 Branches
6 Tags
94 MiB
Commit Graph

254 Commits (revert-b25c0d81)

Author SHA1 Message Date
Moe dfade3791a remove extra log from embed page 2020-03-03 07:14:43 -08:00
Moe ed4eab625a add some windows specific kill and delete commands 
+ add Shinobi Mobile mention
 2020-02-23 10:09:54 -08:00
JordanGeoghegan f5f89e6d74 Fix longstanding issue with incorrect file size calculation 2020-01-31 18:30:24 -08:00
Jordan Geoghegan 1f592d38da There are 1048576 bytes in a mebibyte, not 1000000. Fixes physical RAM display in dashboard. Tested on OpenBSD and Alpine Linux 2020-01-23 21:48:20 +00:00
Moe ef9e3af8a3 Merge branch 'patch-3' into 'dev' 
There are 1048576 bytes in a mebibyte, not 1000000. Fixes physical RAM display in dashboard.

See merge request Shinobi-Systems/Shinobi!149
 2020-01-23 21:39:55 +00:00
Moe 9cb9a72afa add notice for missing database in super user panel 2020-01-21 09:54:18 -08:00
Jordan Geoghegan 68bc043051 There are 1048576 bytes in a mebibyte, not 1000000. Fixes physical RAM display in dashboard. 
Tested on OpenBSD and Alpine Linux
 2020-01-21 02:24:46 +00:00
Moe 62f2dab693 add Open All Monitors to menu 2020-01-10 15:39:44 -08:00
Moe c287a9953c Fix dropInEvents deletion pointer 
+ add Dashcam notice in Help window
+ remove system log whenever a monitor process thread starts (original ones still exist)
 2020-01-03 17:10:36 -08:00
Moe ccd5e252d6 fix powervideo breakage on object event with no matrices 2019-12-22 07:56:24 +06:00
Moe 4d1a2d4977 Allow HLS playback on iOS 
- You may disable JPEG API/JPEG Mode if you use HLS as your Stream Type, this method has been tested to work on iOS 13.1.3
 2019-12-14 13:46:31 +06:00
Moe 759a3702b0 Fix duplicated monitor bug 
+ remove extraneous element
 2019-11-07 10:45:00 -08:00
Moe 662ddedef1 dummy fill missing reason field for event 2019-10-30 14:34:37 -07:00
Moe 797b63581b Merge branch 'update_daterangepicker' into 'dev' 
Update Date Range Picker and Moments

See merge request Shinobi-Systems/Shinobi!130
 2019-10-28 00:35:59 +00:00
Moe ccc98803b8 Add 1 Week Hider for the Popup window 2019-10-27 08:49:04 -07:00
Moe 065ac18d17 Add Subscription Check 2019-10-26 13:29:34 -07:00
Mike Hurley 1b348f7ae4 Update daterangepicker.css to version 3.0.5 2019-10-18 17:28:34 +00:00
Mike Hurley cf797adb0c Update daterangepicker.js to version 3.0.5 2019-10-18 17:27:26 +00:00
Mike Hurley ed3062d4b5 Update moment-with-locales.min.js to version 2.24.0 2019-10-18 17:26:02 +00:00
Mike Hurley 620eeb8da2 Update moment.js to version 2.24.0 2019-10-18 17:23:37 +00:00
Moe 621e58a1c9 fix missing variable for import in multimon 2019-10-17 10:15:27 -07:00
Moe a2dcccd9b9 fix monitor import base object 
+ add copy stream channels
 2019-09-23 15:58:33 -07:00
Moe 4a1789ae89 add m3u8 import capability to multimon+ 
- make it compatible with older buffer types
 2019-09-23 15:08:06 -07:00
Moe 8980a65805 add m3u8 import capability to multimon 2019-09-23 12:09:04 -07:00
Moe 0b9a6d03d4 fix timelapse pointer 2019-09-07 23:18:53 -07:00
Moe 3fa689ce1d remove $.ajax and use regular XHR in downloadAndZip 2019-09-06 17:28:54 -07:00
Moe 5908830f39 Merge branch 'patch-2' into 'dev' 
Added Language vars to super.ejs

See merge request Shinobi-Systems/Shinobi!96
 2019-08-30 17:07:44 +00:00
Moe c501a8929a Fix Timelapse JPEG generatorUrl, Fix Power Video video launch on drag 
+ minor cleanup of unused files
 2019-08-30 10:00:25 -07:00
DewGew ad93dabe1a Merge branch 'dev' into 'patch-2' 
# Conflicts:
#   languages/sv_SE.json
 2019-08-29 11:25:57 +00:00
Moe e7632b6a71 Merge branch 'patch-4' into 'dev' 
Added deleted locale for calendar

See merge request Shinobi-Systems/Shinobi!103
 2019-08-28 15:03:10 +00:00
Moe ee3d1d21b3 Merge branch 'patch-3' into 'dev' 
Fixes for multimon.ejs, lang vars, move/labels

See merge request Shinobi-Systems/Shinobi!101
 2019-08-28 15:02:37 +00:00
Moe d117ba00f9 Merge branch 'Add-lang-vars' into 'dev' 
Added language variables

See merge request Shinobi-Systems/Shinobi!94
 2019-08-28 15:01:06 +00:00
Mike Hurley 1b73aa872a Changed password field type to password, as part of https://gitlab.com/Shinobi-Systems/ShinobiCE/issues/20 2019-08-26 14:26:06 +00:00
DewGew 1f88060f16 Added deleted locale for calendar 2019-08-20 07:44:59 +00:00
DewGew deaa788d04 Update multimon.ejs 2019-08-19 13:30:26 +00:00
DewGew 199bd80c38 Update dash2.multimon.js 2019-08-19 13:29:55 +00:00
DewGew fb4215742b Update super.ejs 2019-08-19 08:34:11 +00:00
DewGew 5b09fff26e Same behavior for headerTitle as in settings.ejs 2019-08-19 08:08:16 +00:00
Moe 9993593e2e Merge branch 'patch-1' into 'dev' 
Added translation on Clock

See merge request Shinobi-Systems/Shinobi!95
 2019-08-19 06:59:02 +00:00
Moe 2acb8bfa57 fix confirm window js 2019-08-18 09:04:57 -07:00
Moe 91da5b3404 Push missing Zoom Glass code for Power Viewer 
+ fix "videoAfter" in powerViewer to fix chained playback.
+ return powerViewer autoplay back to on individual video load
 2019-08-17 19:47:59 -07:00
Moe 0434620ec8 Add Zoom In Magnifier to live stream and Power Video 
+ adjust logWriter flood check timeout
+ minor cleanup (removing ";" just for you @kevinGodell)
 2019-08-16 13:19:22 -07:00
DewGew 620b036693 Update super.ejs 2019-08-13 07:26:39 +00:00
DewGew 052b9905e4 Update super.ejs 2019-08-13 07:25:35 +00:00
DewGew b86784d8b3 Added Language vars to super.ejs 2019-08-13 07:14:00 +00:00
Moe 55b8aafb0f minor cleanup and fixes 2019-08-12 15:23:11 -07:00
Moe bdaff16329 add tab changer, add tabs to power video menu 2019-08-11 20:43:38 -07:00
Moe dff2629722 Revert "Revert "Revert "Revert "Revert "Revert "force ftp/smtp events to save to sql by default"""""" 
This reverts commit 7ac630a0f7.
 2019-08-11 20:42:42 -07:00
Moe 7ac630a0f7 Revert "Revert "Revert "Revert "Revert "force ftp/smtp events to save to sql by default""""" 
This reverts commit 71184a2cc3.
 2019-08-11 20:42:29 -07:00
Moe 71184a2cc3 Revert "Revert "Revert "Revert "force ftp/smtp events to save to sql by default"""" 
This reverts commit f9b8a2f11a.
 2019-08-11 20:41:22 -07:00