Commit Graph

1586 Commits (40928b04392bebfea9a6d2518f089f017a1e79d6)

Author SHA1 Message Date
Moe Alam 40928b0439 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2020-10-25 11:44:14 -07:00
Moe Alam c009fbc1a2 Simplify map (Additional Input) checking 2020-10-25 11:44:07 -07:00
Moe 8696b8d76d Merge branch 'patch-1' into 'dev'
Fixed MariaDB password bug for CentOS installer

See merge request Shinobi-Systems/Shinobi!250
2020-10-20 23:58:09 +00:00
Mike Hurley 2449f1b112 Fixed MariaDB password bug 2020-10-20 15:30:33 +00:00
Moe Alam c69d761009 ShinobiHub config search use public configs 2020-10-18 18:54:08 -07:00
Moe Alam 702be4c927 fix hanging process with motion enabled (coProcessor junk removed) 2020-10-18 18:53:20 -07:00
Moe Alam 20f963ef06 return ffmpeg string parse code to old method 2020-10-18 17:29:06 -07:00
Moe Alam 22c4867eea bug cleanup 2020-10-18 17:18:46 -07:00
Moe Alam 7eeeebec10 remove coSpawnClose 2020-10-18 14:13:57 -07:00
Moe Alam 6353c2c3bb Update ffmpeg.js 2020-10-18 10:28:36 -07:00
Moe Alam 1d3aba59d6 add separate mapping available to Object Detector, default is global's 2020-10-17 20:35:35 -07:00
Moe Alam cbe0af5273 make google drive "Get Code" button launch setup tutorial if minimum not set 2020-10-17 18:40:25 -07:00
Moe Alam ea9e97e437 remove coprocessor code 2020-10-17 18:39:54 -07:00
Moe Alam bab046a741 minor cleaning 2020-10-17 15:11:23 -07:00
Moe Alam 82c03feec4 ffmpeg.js : rewrite detector frame output 2020-10-17 14:34:10 -07:00
Moe Alam 75be669bc2 add pureStream for video file API method 2020-10-15 15:07:26 -07:00
Moe Alam 3a33735bdd Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2020-10-15 14:59:27 -07:00
Moe Alam 2c9ef73b0b REVERT cron.js - CRITICAL BUG IN PREVIOUS REVISION 2020-10-15 14:59:16 -07:00
Moe ed1b8817b7 Merge branch 'dapowers87-docker-init-extension' into 'dev'
Add in init.extension.sh

See merge request Shinobi-Systems/Shinobi!245
2020-10-15 16:54:46 +00:00
Moe Alam c28cd32bbb cleanups 2020-10-11 23:11:39 -07:00
Moe Alam 24141f0e48 add proper message for timelapse frame deletion 2020-10-10 10:36:13 -07:00
Moe Alam ba40d5bdb1 fix fileBin purging function 2020-10-09 22:50:49 -07:00
Moe Alam 368c23af25 Allow P2P server to pass real IP of user connected to dashboard 2020-10-09 22:50:08 -07:00
Moe Alam 560cf2c7ec add row caching and add delete button for timelapse frames 2020-10-09 22:49:11 -07:00
Moe Alam 76b9d7f105 fix Tmelapse Frame purge 2020-10-09 17:11:54 -07:00
Moe Alam dea7738713 Fix backward timelapse video 2020-10-09 12:47:08 -07:00
Moe Alam aae352c998 humanize timelapse mp4 builder 2020-10-09 12:34:15 -07:00
Moe Alam 862bcb4d1d Show more live stats in P2P Server selection 2020-10-08 17:01:23 -07:00
Moe Alam d462978454 modify PTZ center button to move camera to Home position for ONVIF 2020-10-08 16:57:20 -07:00
Moe Alam a50d7041dc http icon flag handler from query string 2020-10-07 14:26:30 -07:00
Moe Alam c43377d196 humanize Easy Remote Access tab more 2020-10-07 14:25:28 -07:00
dapowers87 054ac9bb8d Move where the extension file would be expected to live
Remove blank extension file
2020-10-05 23:42:03 +00:00
dapowers87 73c4cf6bf9 change the way it was being called 2020-10-05 23:31:10 +00:00
dapowers87 a10693bc14 add in init.extension.sh 2020-10-05 23:15:19 +00:00
Moe Alam ce5107550a p2p : kill client connections when server disconnects 2020-10-03 15:48:25 -07:00
Moe Alam acb7035769 Display Currently Registered P2P Server 2020-10-03 14:20:53 -07:00
Moe Alam 53b9c42c2c add feedback for copying to clipboard 2020-10-03 12:02:28 -07:00
Moe Alam b200a7d1bc Update easyRemoteAccess.ejs 2020-10-03 11:55:10 -07:00
Moe Alam 6dc438fdd7 humanize P2P UI more 2020-10-03 11:54:48 -07:00
Moe Alam 04d57a56c1 show network use in p2p server stats 2020-10-03 00:27:04 -07:00
Moe Alam eb8d893b72 Show stats of P2P Server in list 2020-10-02 23:13:06 -07:00
Moe Alam e45c411490 Add Production P2P Servers to list in Super User Panel 2020-10-02 21:27:29 -07:00
Moe ec2544b887 Merge branch 'CentOS_Installer_8_Update' into 'dev'
CentOS installer 8 update

See merge request Shinobi-Systems/Shinobi!242
2020-10-01 22:06:21 +00:00
Mike Hurley a8b20fbb10 Merge branch 'master' into 'CentOS_Installer_8_Update'
# Conflicts:
#   INSTALL/CentOS - Quick Install.sh
2020-10-01 20:15:03 +00:00
Mike Hurley 16bf6657c6 Now verifies SQL credentials before proceeding with installation 2020-10-01 20:00:44 +00:00
Mike Hurley ec0d93ebc4 Fixed extra whitespace at end of IP address in Installation Complete notice 2020-10-01 17:49:31 +00:00
Mike Hurley 0c4ae5b4c7 fixed a typo 2020-10-01 17:36:25 +00:00
Mike Hurley 89e3e872dd Fix MariaDB installer 2020-10-01 17:16:25 +00:00
Mike Hurley faadcbdab0 Fix MariaDB installation option 2020-10-01 16:54:48 +00:00
Moe Alam 5cafdf57b3 fix autoplay Poseidon and HLS if browser is not selected while loading 2020-10-01 09:30:26 -07:00