Commit Graph

876 Commits (268ce83784f7ff7ff074ce5479fcf790107bcbc0)

Author SHA1 Message Date
Moe Alam 91fadc44df P2P : Can create connection based on config 2020-09-13 23:49:52 -07:00
Moe Alam 9f157abe8c minor cleanup 2020-09-06 12:16:25 -07:00
Moe Alam 22c9b334b6 Cache video row when viewing to prevent database hammer on chunking 2020-09-06 12:11:36 -07:00
Moe Alam d1e68ffe37 Revert ftp daemon back to ftp-srv
- The telnet vulnerability was fixed, no longer any need to attempt migration
2020-09-06 11:55:42 -07:00
Moe Alam e791a9895e fix deleting monitorStates 2020-09-06 09:41:51 -07:00
Moe Alam 49be90333f Disallow email spamming from improper account creations 2020-09-05 09:46:31 -07:00
Moe Alam 7c1a1a0c08 re-engage previous mp4 file serving 2020-09-02 14:38:13 -07:00
Moe 2acec03cc7 Merge branch 'minor-bugs' into 'dev'
Minor Bug: Entering to an undefined variable on libs/webServerPaths.js

See merge request Shinobi-Systems/Shinobi!230
2020-08-28 20:02:56 +00:00
Sebastián Felipe 4e9c6b9dd3 minor bug solved 2020-08-28 15:35:45 -04:00
Moe 41cd51ccd6 update ram collection 2020-08-28 09:30:25 -07:00
Moe cf6799eff2 add damaged audio warning 2020-08-27 21:58:42 -07:00
Moe 3cfa84e317 update ram collection 2020-08-27 19:45:49 -07:00
Moe 815fbb0cae remove extraneous option 2020-08-27 16:20:33 -07:00
Moe 4af8b7ff8c update CPU use collection for Child Nodes 2020-08-27 15:49:16 -07:00
Moe a3df638988 Update CPU and RAM collection and display methods 2020-08-27 15:40:30 -07:00
Moe 2886e58918 Child Node cameraDestroy fix 2020-08-27 15:39:39 -07:00
Moe d916b8d5cd Minor cleanup++ 2020-08-26 22:40:57 -07:00
Moe 6398578897 Minor cleanup+ 2020-08-26 22:37:44 -07:00
Moe cc4adfa5bc Minor cleanup in libs/monitor.js+ 2020-08-26 22:30:18 -07:00
Moe 1bb95ef664 Minor cleanup 2020-08-26 22:18:42 -07:00
Moe a446c0aa59 Minor cleanup in libs/monitor.js 2020-08-26 21:36:36 -07:00
Moe 3e8d605de8 Merge branch 'poseidon-mp4-command-issue' into 'dev'
Poseidon Socket-IO "Race Condition" Issue

See merge request Shinobi-Systems/Shinobi!229
2020-08-27 00:46:10 +00:00
Moe f0321004ac Update Docker image to use Ubuntu 20.04 2020-08-26 15:30:34 -07:00
Sebastián Felipe 7e44316c39 issue solved 2020-08-26 14:41:20 -04:00
Moe 37ad70ba6c update /config/conf.json when conf.json saved from Superuser panel 2020-08-26 10:34:10 -07:00
Moe 21eee0f477 save super.json in /config on update - Docker only 2020-08-26 10:26:58 -07:00
Austin Lakeman 31eaa2efbc timelapse and minor error fixes 2020-08-25 21:55:01 +00:00
Moe 7387866aee Merge branch 'dev' into 'dev'
Remote ONVIF Control

See merge request Shinobi-Systems/Shinobi!226
2020-08-19 18:47:05 +00:00
Moe 8a6bfecf05 add cuda and opencl hwaccel options 2020-08-19 11:46:29 -07:00
Sebastián Felipe dedaa79a68 Remote ONVIF Control 2020-08-19 01:11:11 -04:00
Moe b193827192 fix row deletion 2020-08-18 08:42:43 -07:00
Moe b06a3ee1a9 speed up monitor snapshot retrieval on login 2020-08-17 11:26:05 -07:00
Moe 3f13478d60 temporary fix for 2 factor auth login 2020-08-17 11:25:42 -07:00
Moe 20633e2da4 cleaner snapshot creation 2020-08-16 15:41:05 -07:00
Moe c4a56f276c Update monitor.js 2020-08-15 22:08:12 -07:00
Moe b14ef3cda6 fix caching for snapshot icon 2020-08-15 22:06:22 -07:00
Moe 9b00ec8d93 Icon HTTP API Endpoint 2020-08-15 20:36:32 -07:00
Moe 0462aae539 lightly update FileBin methods, prepare for shinobi-video-synopsis 2020-08-14 23:05:01 -07:00
Moe b7cd712ba7 update debugLog 2020-08-14 19:22:33 -07:00
Moe 0d92d354c7 keep primary Temp directory path in memory 2020-08-14 19:21:55 -07:00
Moe b71dc60f20 validation for failed FTP login attempt 2020-08-14 12:30:17 -07:00
Moe cb279ef400 By default enable Use Camera Timestamps 2020-08-14 10:28:40 -07:00
Moe cb5a170aa2 fix Child Node video push 2020-08-12 20:04:08 -07:00
Moe 0ea7857e45 Update notification.js 2020-08-12 18:21:38 -07:00
Moe aa1e552325 Update notification.js 2020-08-12 17:49:19 -07:00
Moe 09a92e7d17 make custom events run syncronously inside async function 2020-08-12 17:37:24 -07:00
Moe f2828dd0cc make s.getRawSnapshotFromMonitor a Promise function 2020-08-12 17:37:04 -07:00
Moe a6fdc9cf51 Replace FTP Server (ftp-srv) with ftpd (shinobi-ftpd) 2020-08-12 16:35:30 -07:00
Moe 495b5cf0b8 disable ranges in mp4 file streamed over http 2020-08-12 10:37:59 -07:00
Moe 7e18b8e1f3 minor update on ptz logging 2020-08-11 13:29:15 -07:00
Moe 4ed8063c6a Merge branch 'issue-200' into 'dev'
Issue 200 solved

See merge request Shinobi-Systems/Shinobi!222
2020-08-11 19:36:15 +00:00
Sebastián Felipe Torres Garfe 872bc207bc bug and its related dependencies, solved 2020-08-11 15:00:33 -04:00
Moe 6054f50baa add smtpServerOptions conf.json parameter
Options available are https://nodemailer.com/extras/smtp-server/
2020-08-11 09:16:53 -07:00
Moe 70eedf740e customAutoLoad UI : minor prettify++ 2020-08-10 21:40:22 -07:00
Moe 8bf7909191 customAutoLoad UI : Display Install Information 2020-08-10 21:10:05 -07:00
Moe d0425d7712 customAutoLoad : validation updates 2020-08-10 20:31:28 -07:00
Moe 650122c384 Prepare FileBin management : add proper FileBin database controller func + 2020-08-10 20:31:02 -07:00
Moe 4696f1131d Prepare FileBin management : add proper FileBin database controller functions 2020-08-10 20:30:50 -07:00
Moe 2acb60f880 customAutoLoad management fixes+ 2020-08-10 16:10:49 -07:00
Moe 36d7c71a54 customAutoLoad management fixes 2020-08-10 15:58:56 -07:00
Moe e119bd10d6 customAutoLoad Module UI : Download Method 2020-08-09 23:22:35 -07:00
Moe 7f997649df customAutoLoad Module UI : Enable, Disable, Delete, Install functions 2020-08-09 23:13:18 -07:00
Moe c95f34d7da Fix permissions to view monitors for sub accounts+ 2020-08-09 19:21:26 -07:00
Moe 7948ef9089 Fix permissions to view monitors for sub accounts 2020-08-09 19:18:32 -07:00
Moe df730d8aa0 add new packages + minor clean 2020-08-09 15:56:27 -07:00
Moe f27111c434 Update webServerPaths.js 2020-08-09 11:13:31 -07:00
Moe 9fa36cb34e API endpoints for managing customAutoLoad modules+ 2020-08-08 20:48:37 -07:00
Moe 28c8c2a07b Update customAutoLoad.js 2020-08-08 20:22:26 -07:00
Moe 5078abdbfa API endpoints for managing customAutoLoad modules 2020-08-08 20:20:49 -07:00
Moe bded8b5699 Prepare customAutoLoad install functions for UI++ 2020-08-08 12:30:01 -07:00
Moe 5e2736c233 minor clean up 2020-08-08 12:23:21 -07:00
Moe f5c2b936fc Prepare customAutoLoad install functions for UI+ 2020-08-08 12:21:38 -07:00
Moe f70cfcfe19 Prepare customAutoLoad install functions for UI 2020-08-08 00:44:00 -07:00
Moe e0c9d4c434 Merge branch 'dev' into 'rebuild-sql-queries'
# Conflicts:
#   libs/startup.js
#   libs/webServerPaths.js
2020-08-08 00:16:24 +00:00
Moe 38ce2cdcff update some more array-based conditons to object 2020-08-07 16:37:27 -07:00
Moe 4be1659873 update some delete queries 2020-08-07 15:12:45 -07:00
Moe 52a84f4501 pass only groupKey when request Max Storage Amount check 2020-08-07 00:54:56 -07:00
Moe 811b6fc846 Modify Max Purge for Video, Timelapse Frames, FileBin, addStorage 2020-08-06 21:33:58 -07:00
Moe 80ad30af6c Uploaded Videos can no longer be streamed in (use streamIn instead) 2020-08-06 11:40:38 -07:00
Moe ede3bd50d3 minor cleanup 2020-08-06 10:44:38 -07:00
Moe cf96da5077 Update socketio.js 2020-08-06 10:05:03 -07:00
Moe 878b386782 Update user.js 2020-08-05 20:41:36 -07:00
Moe a311f830a2 sqlQuery Conversion : fix purging on maxStorageAmount 2020-08-05 20:41:01 -07:00
Moe 8cc22ffde4 limit user select for loadGroupApps (only need 1) 2020-08-05 18:59:58 -07:00
Moe f29e77846c sqlQuery Conversion : Fix syntax errors+ 2020-08-05 18:16:50 -07:00
Moe c56fbc1d93 sqlQuery Conversion : Fix syntax errors 2020-08-05 18:15:10 -07:00
Moe bcf7c6f665 deprecate automatically selecting single monitor if result is only 1 2020-08-04 19:46:05 -07:00
Moe c0ce19b1eb deprecate automatically selecting single monitor if result is only 1 2020-08-04 19:45:04 -07:00
Moe 17779c0255 postgres needs groupBy on counts
- why? some will never know. I sure don't.
2020-07-30 18:42:09 -07:00
Moe 3ecbb6da01 Update sql.js 2020-07-30 18:34:53 -07:00
Moe 751b59e957 add groupBy 2020-07-30 18:25:57 -07:00
Moe 5f88de0690 Update sql.js 2020-07-30 18:17:41 -07:00
Moe 4352e043dd Update sql.js 2020-07-30 18:01:55 -07:00
Moe 51a051a0fc add log for missing where parameter
+ fix incorrect "action" label for monitorOrder queries
2020-07-30 17:58:45 -07:00
Moe f32af44122 remove pattern_type glob from timelapse creation
- caused newer versions of ffmpeg to crash. flag no longer exists.
2020-07-30 13:56:26 -07:00
Moe c273d2f8c2 fix missing where query+ 2020-07-30 13:55:36 -07:00
Moe ebb25eb187 fix missing where query 2020-07-30 13:52:29 -07:00
Moe 22f2d37f1f Show GPS data on Video Recordings (if they have it) 2020-07-29 16:38:04 -07:00
Moe f523ccc2f2 Add Live GPS Display from Dashcam App (NinjaCam) 2020-07-29 11:00:30 -07:00
Moe c42fbb85fd sqlQuery Conversion : fix permissions for some endpoints 2020-07-27 18:22:12 -07:00
Moe 795703cfaf sqlQuery Conversion : The Last Samurai... err... Function 2020-07-27 18:12:57 -07:00
Moe 70524dafbb Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2020-07-27 14:15:42 -07:00
Moe 6ace0dfbed Merge branch 'always_record_on_motion' into 'dev'
Optionally allow recording to start on motion prior to object detection results.

See merge request Shinobi-Systems/Shinobi!217
2020-07-27 18:11:50 +00:00
Moe 776a7b7f74 allow adding details to externally uploaded video file 2020-07-25 23:15:24 -07:00
Moe 7d07124ac5 force image format for image in Email Notifcation (Discord as well)
- This should hopefully fix users with broken images in their email notifications.
-- Audio was not being stripped and was being encoded with the frame (JPEG cannot hold audio, duh)
-- image2 format specified
2020-07-25 22:40:35 -07:00
Moe e6b5f42ce4 minor housekeeping 2020-07-22 21:21:34 -07:00
Moe 874f774d9a change to reason instead of "Motion" as title for email screenshot filename 2020-07-22 21:21:09 -07:00
Moe c7c8d620e1 Capture startup video counting errors and post to systemLog 2020-07-22 21:19:51 -07:00
Moe cf91cf85ea Update Dashcam (Shinobi Streamer) data Input 2020-07-22 21:19:16 -07:00
Moe 24a9b2e6e4 Automatic redirect to HTTPS when enabled (fixed) 2020-07-15 09:34:43 -07:00
Moe 155b945285 fix reoccurrring const groupKey+ 2020-07-14 23:49:31 -07:00
Moe d6bf8e058b fix reoccurrring const groupKey 2020-07-14 23:43:01 -07:00
Moe 2707a13960 Automatic redirect to HTTPS when enabled 2020-07-14 23:38:13 -07:00
Ian Rubado a72ea774a8 Optionally allow recording to start on motion prior to object detection results. 2020-07-13 21:50:52 -04:00
Moe 7d940cdce5 Fix Error on SFTP Error 2020-07-13 11:39:35 -07:00
Moe 0bc88bab74 notifications.js : add template to email notification (prettify) 2020-07-12 15:37:14 -07:00
Moe 93ee667f07 webServerPaths : fix some permissions and responses 2020-07-12 14:34:41 -07:00
Moe c2cab29515 knexQuery logic fixes 2020-07-12 14:34:04 -07:00
Moe 875bedbc6d Fix knexQuery error : empty condition 2020-07-11 18:06:07 -07:00
Moe 122127f162 Update webServerPaths.js 2020-07-11 16:19:43 -07:00
Moe 64a019eac7 Update plugins.js 2020-07-11 14:45:53 -07:00
Moe 4b7371e635 sqlQuery Addition : plugins, childeNode 2020-07-11 14:44:37 -07:00
Moe a07ae2add3 existing preQueries now only for MySQL databases 2020-07-11 14:33:45 -07:00
Moe ef336d13d8 sqlQuery Conversion : cleanup timelapse slightly 2020-07-11 14:11:39 -07:00
Moe 5a8f3d5afd add generic SELECT function 2020-07-11 14:10:36 -07:00
Moe b1bb64397a sqlQuery Conversion : webServerSuperPaths.js
+ superApiPrefix fix
+ minor fixes
2020-07-11 14:06:25 -07:00
Moe 9b18fb39ba sqlQuery Conversion : webServerPaths.js 2020-07-11 14:00:14 -07:00
Moe f1fc729435 sqlQuery Conversion : minor cleanup 2020-07-11 13:16:01 -07:00
Moe 69f038a477 sqlQuery Conversion : webServerAdminPaths.js 2020-07-11 11:14:30 -07:00
Moe 556ea34ba8 sqlQuery Conversion : minor cleanup 2020-07-11 00:39:11 -07:00
Moe 70c125db56 sqlQuery Conversion : videos 2020-07-11 00:33:25 -07:00
Moe 194593e59c sqlQuery Conversion : user, videoDropInServer 2020-07-11 00:07:55 -07:00
Moe 1abef5ebe7 sqlQuery Conversion : uploaders 2020-07-10 18:58:23 -07:00
Moe aebd01cefd sqlQuery Conversion : minor update to socketio.js 2020-07-10 17:30:31 -07:00
Moe 7f42e3efd0 sqlQuery Conversion : timelapse.js (also refactored backend slightly) 2020-07-10 17:30:08 -07:00
Moe 6dfdfe2aa0 sqlQuery Conversion : Add grouped where conditions 2020-07-09 22:48:54 -07:00
Moe 21ea4d804f sqlQuery Conversion : basic, events, notifications, scheduler, socketio 2020-07-09 22:48:34 -07:00
Moe 0f73187cb3 sqlQuery Conversion : add limit and orderBy 2020-07-09 07:58:02 -07:00
Moe 477d756bef sqlQuery Conversion : make asCallback inside knexQuery 2020-07-09 07:57:54 -07:00
Moe 5db94d1e98 sqlQuery Conversion : auth.js 2020-07-08 23:11:43 -07:00
Moe b99e258f8f sqlQuery Conversion : monitor.js 2020-07-08 22:52:49 -07:00
Moe e1cc2d3fec sqlQuery Conversion : rename response to dbQuery 2020-07-08 22:51:45 -07:00
Moe b7db2ecfe9 sqlQuery Conversion : add update, insert, delete to s.knexQuery
+ change option tableName to table
2020-07-08 22:38:32 -07:00
Moe b02311386b sqlQuery Conversion : startup.js 2020-07-08 21:34:12 -07:00
Moe ce7b86d3a1 sqlQuery Conversion : create knexQuery, can only select for now 2020-07-08 21:34:06 -07:00
Ian Rubado 6b7a17e4ce Allow detector filters to send emails without a monitor global detector setting of sending email being sent. 2020-07-04 15:31:05 -04:00
Moe f178d2121c Revert Detector Filter changes (will branch to identify why it drops motion) 2020-07-04 10:04:58 -07:00
Moe fb7972223b fix not-iterable error in events 2020-07-04 08:56:17 -07:00
Moe 05594374d4 Fix ER_DUP_KEYNAME logs 2020-07-03 13:21:04 -07:00
dennis.cartier 58c5796d4b Switch logging to user log from system 2020-06-27 14:40:43 -04:00
dennis.cartier 5ddfbcb5d3 Add support for testing count of matched objects 2020-06-26 05:43:36 -04:00
dennis.cartier 212cecdc9c Fix too early of insertion of detector_motion_count before all returns have been considered 2020-06-24 16:50:53 -04:00
Moe 98bc29e8eb Merge branch 'dev-region-testing' into 'dev'
Add support for Region Name testing into detection filters

See merge request Shinobi-Systems/Shinobi!203
2020-06-24 18:26:43 +00:00
dennis.cartier 923312da38 Make the Global Drop be the default beahviour 2020-06-19 14:00:25 -04:00
Moe e81736ffd5 Merge branch 'SQL_Updates' into 'dev'
Add indexes to database tables

See merge request Shinobi-Systems/Shinobi!206
2020-06-19 16:44:34 +00:00
Moe ded730197c Fix Event Counts table (missing time column) 2020-06-18 20:22:44 -07:00
Mike Hurley 07d5d360d8 Update sql.js 2020-06-18 18:42:20 +00:00
Mike Hurley 76a4ef41fd Update sql.js 2020-06-18 16:44:13 +00:00
Mike Hurley 0e69072a80 Update sql.js 2020-06-18 16:33:47 +00:00
Mike Hurley 486c724c74 Update sql.js 2020-06-18 16:17:13 +00:00
Mike Hurley afe32e6f1b fixed mismatched cases 2020-06-18 16:12:46 +00:00
Mike Hurley 80db711d4a Updated to include Indexes for Events, Logs, and Videos tables 2020-06-18 15:23:58 +00:00
Moe b50d0a6bcc Update ONVIF version and light cleanup 2020-06-18 00:51:25 -07:00
Moe f07fe1968f JPEG Input Type capture from Camera Thread (Fix JPEG Input Stream) 2020-06-18 00:51:06 -07:00
dennis.cartier 91f5ff6b76 Add support to only test matrices that passed filters for the Region Test flag 2020-06-17 08:23:46 -04:00
dennis.cartier c7759063f3 Fix non-filtered matrices from being written into Events table 2020-06-16 07:45:35 -04:00
Moe f044b6bcf8 Fix missing npm module 2020-06-15 15:18:22 -07:00
Moe f5ac026520 Google Drive Upload creates appropriate folder for video 2020-06-15 08:33:57 -07:00
Moe 5547ff0b25 Allow watching uploaded videos from Google Drive in Dashboard 2020-06-15 07:53:08 -07:00
Moe 2c320635dc baisc Google Drive support for Auto Backup
- Cannot view videos or timelapse frames in the Shinobi Dashboard, must view them in Google Drive File Explorer
2020-06-15 00:54:52 -07:00
dennis.cartier 57c51f17c8 Remove a conditional that no longer applies 2020-06-14 06:58:20 -04:00
dennis.cartier e86d3e03df Change the result passing for the matrix region collisions and add test to short circuit hopeless calls 2020-06-14 06:58:20 -04:00
dennis.cartier 0621ef9b35 re-write of legacy object matching to remove missed corner cases 2020-06-14 06:58:20 -04:00
dennis.cartier e732db8656 Add support for Region Nmes testing 2020-06-14 06:54:49 -04:00
Moe 773351313f Allow PTZ Tracking any Object Tag 2020-06-13 22:17:54 -07:00
Moe df720fcab2 remove PTZ Tracking debug comments 2020-06-13 11:56:54 -07:00
Moe 57a876e28d minor cleanup for PTZ handling 2020-06-13 11:46:20 -07:00
Moe fc082daf8c ptz command display direction in log row 2020-06-13 11:35:09 -07:00
Moe 866cb8d538 Refactor PTZ Control code+++ 2020-06-13 11:30:04 -07:00
Moe c004275fa8 put logger inside s.cameraControl callback 2020-06-13 11:27:46 -07:00
Moe beccde6fdc Refactor PTZ Control code++ 2020-06-13 11:27:03 -07:00
Moe ab8971ad28 Refactor PTZ Control code+ 2020-06-13 11:04:38 -07:00
Moe bbc1dc533f Refactor PTZ Control code, move ptz and onvif code to separate libs 2020-06-13 00:28:50 -07:00
Moe ba32e44e2c Merge branch 'dev-confidence-testing' into 'dev'
Add confidence testing into switch statement

See merge request Shinobi-Systems/Shinobi!202
2020-06-10 20:57:25 +00:00
dennis.cartier 20e4a89e04 Add support to test confidence property in object detection 2020-06-08 05:40:51 -04:00
Moe 3781ea5f35 PTZ Tracking : Auto-Up require object height larger than 80% of img height 2020-06-07 23:44:45 -07:00
Moe 47aa4fd55b PTZ Tracking : Fix Auto-Up 2020-06-07 23:08:04 -07:00
Moe 3d3ca32bc3 PTZ Tracking : if person too low on screen then lower tilt 2020-06-07 22:52:26 -07:00
Moe 2566d52b3e PTZ Tracking : Now does both X and Y axis following on larget person object found
- if person object Y value is less than 30 then camera will automatically move upward. In future this will be configurable.
2020-06-07 22:45:55 -07:00
Moe b93abc1589 Basic PTZ Follow : detecting position on X axis works, y axis does not 😭 2020-06-07 11:48:39 -07:00
Moe 2c7fd09c94 Basic PTZ Follow now only follows largest "person" object found
- will think of better name later
2020-06-07 10:32:44 -07:00
Moe df1cf56d62 Basic PTZ Follow upon Object Detection 2020-06-06 23:50:43 -07:00
Moe 600a7f5641 Better ONVIF Scanner, now displays all found network devices
- Will now display ONVIF devices if auth fails
- will now display all network devices with operating web panels
2020-06-06 20:45:08 -07:00
Moe f1f22a49f1 return devices that are possible IP cameras even if failed ONVIF capture 2020-06-06 19:07:59 -07:00
Moe a0f07406cc Move Probe and ONVIF functions to separate lib (scanners.js) 2020-06-06 18:55:01 -07:00
Moe 34d9b49f6b Refactor Probe tool (backend), cleanup Probe tool (front) 2020-06-06 15:29:57 -07:00
Moe 5bf8a04d53 Probe result can populate Monitor Settings window 2020-06-06 13:47:27 -07:00
Moe f8a0160356 fix Probe JSON output 2020-06-06 13:13:04 -07:00
Moe 615f66bb1b better port validation on monitor start 2020-06-05 15:25:02 -07:00
Moe cd9b2bd857 Update events.js 2020-06-05 08:33:01 -07:00
Moe aa7c6f387a update syntax for Event Counts table creation 2020-06-04 13:06:13 -07:00
Moe c8e054ce25 validate port chosen on monitor start 2020-06-04 12:59:46 -07:00
Moe 41d25a58ab fix missing cloud timelapse frames table insertion 2020-06-04 12:59:25 -07:00
Moe eb5aa7909e add option to enable logging for smtp-server 2020-06-01 22:17:36 -07:00
Moe 059faab18d Fix IP-based authorization for API keys 2020-05-30 22:36:19 -07:00
Moe 5436dab375 Fix "Object in Region" detection (by UnlikelyLocation9 in the Community chat) 2020-05-28 12:10:27 -07:00
Moe 683218d988 minor touch up 2020-05-27 17:48:30 -07:00
Moe c2a9633cc1 Refactor Schedules js, add Scheduler launcher in Preset section 2020-05-27 17:46:37 -07:00
Moe e2ea8c03fe Allow creating Presets from inside Monitor Settings window 2020-05-25 20:49:12 -07:00
Moe 479efbf228 adjust counting methodology for tracking plugins
- tracking plugins are currently not available to public but you may still use the counting feature on a per-frame basis instead of tracked object
2020-05-24 22:10:31 -07:00
Moe 48e6483550 fix line 405 bug 2020-05-24 21:00:19 -07:00
Moe 7c60fd16de Update webServerPaths.js 2020-05-24 13:55:48 -07:00
Moe 93fdabb232 refactor /logs/ rows API method 2020-05-24 09:36:52 -07:00
Moe 7cd55de801 Hide username and password in ffmpeg log outputs+ 2020-05-24 09:01:58 -07:00
Moe 1269bfe08a refactor /events/ rows API method 2020-05-24 08:44:44 -07:00
Moe aa390287f0 fix query by time 2020-05-24 07:46:00 -07:00
Moe a5b04de5de refactor /videos/ row request API 2020-05-24 07:41:10 -07:00
Moe 8526eea89a refactor querying tables for rows binded to monitors with start and end times
- prepare function for other API functions that use this methodology
2020-05-23 23:08:54 -07:00
Moe 0379fa70a7 Update sql.js 2020-05-23 22:33:57 -07:00
Moe d79a59f401 refactor Events Counts get rows API method 2020-05-23 22:33:55 -07:00
Moe 664a30ee32 add Event Counting engine 0.1 2020-05-23 22:12:42 -07:00
Moe f35136b46c Hide username and password in ffmpeg log outputs 2020-05-23 16:19:34 -07:00
Moe e6b309b7c8 Add API request to upload all available monitor configs 2020-05-20 10:44:56 -07:00
Moe 16f243000c Add API method to get configurations
- by default gets user uploaded configurations
2020-05-20 08:59:50 -07:00
Moe 4ce3494113 Update shinobiHub.js 2020-05-20 08:31:01 -07:00
Moe 3f0efd3c5c Add option for automatic private backup of monitors to ShinobiHub
- This feature is for Subscribers only.
2020-05-19 16:56:21 -07:00
Ian Rubado b724724cfb Changed per Moe's reccomendation. 2020-05-15 21:28:27 -04:00
Ian Rubado cbd145ff73 Fix whitespace vs tab. 2020-05-15 18:41:15 -04:00
Ian Rubado d0b3b6eedd Resolving a zombie ffmpeg process on linux under certain conditions. 2020-05-15 18:34:12 -04:00
Moe 5e51c6694c fix stray fps 2020-05-13 22:43:18 -07:00
Moe 0c3e611a39 fix mapping in detactor output 2020-05-13 20:14:06 -07:00
Moe 82182fe8bf Fix "undefined" dropInEvents folder 2020-05-13 18:07:54 -07:00
Moe 447cce9b6f Adjustment to Snapshot command 2020-05-13 17:39:00 -07:00
Moe 91bd1f3b5e Fix High CPU Usage with JPEG API and Timelapse 2020-05-13 17:38:56 -07:00
Moe f5c3467ea7 properly expose some object detection options 2020-05-13 15:32:53 -07:00
Moe b0c3f38049 fix large image object detection 2020-05-13 15:10:08 -07:00
Moe a993130f4b Fix "Send Frames" for Object Detector 2020-05-13 14:30:50 -07:00
Moe 6192c27fd2 Complete Plugin Cluster Method, first revision
- Plugin cluster chooses which plugin to send to based on how many frames are in the plugin's queue.
2020-05-11 18:51:05 -07:00
Moe 0fc140d3be fix monitor process hang if ordered to do obj detection with no plugin 2020-05-11 15:57:40 -07:00
Moe 9c566644a1 Convert to Packagable Syntax 2020-05-09 17:27:44 -07:00
Moe 301bb4ebca minor formatting 2020-05-09 16:16:22 -07:00
Moe beb621de5b basic plugin cluster handling 2020-05-07 23:01:16 -07:00
Moe 14037040b8 disable automatcally deleteing current after 10 idle seconds
- future update will incorporate logging this count on interval
2020-05-07 08:41:17 -07:00
Moe 66e71e3269 display expiration date for limited time subscriptions (PayPal) 2020-05-07 08:40:19 -07:00
Moe d72b61f592 Add Basic Object Counting mechanism 2020-05-05 08:02:23 -07:00
Moe 5dbeb8c5e5 Add Wallclock Timestamp toggle in Monitor Settings 2020-05-02 13:25:38 -07:00
Moe 39090fb9b4 dont allow sub user to modify addStorage 2020-04-19 07:57:39 -07:00
Moe 1502d0a200 Allow disabling Wallclock Timestamps with conf.json parameter
- add `"wallClockTimestampAsDefault":false` to disable it.
2020-04-19 07:56:56 -07:00
Moe 39b8337b1c fix concatted detector event response 2020-04-10 08:59:48 -07:00
Moe 1a8fa925de Merge branch 'filter_streamtype_for_tv_channels' into 'dev'
Filter streamtype for tv channels

See merge request Shinobi-Systems/Shinobi!178
2020-04-06 20:41:30 +00:00