Commit Graph

104 Commits (3cfa84e317cdfc7113c55b632f5cc9953f7bde12)

Author SHA1 Message Date
Moe 3f13478d60 temporary fix for 2 factor auth login 2020-08-17 11:25:42 -07:00
Moe 0462aae539 lightly update FileBin methods, prepare for shinobi-video-synopsis 2020-08-14 23:05:01 -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 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 e0c9d4c434 Merge branch 'dev' into 'rebuild-sql-queries'
# Conflicts:
#   libs/startup.js
#   libs/webServerPaths.js
2020-08-08 00:16:24 +00: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 a311f830a2 sqlQuery Conversion : fix purging on maxStorageAmount 2020-08-05 20:41:01 -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 22f2d37f1f Show GPS data on Video Recordings (if they have it) 2020-07-29 16:38:04 -07:00
Moe c42fbb85fd sqlQuery Conversion : fix permissions for some endpoints 2020-07-27 18:22:12 -07:00
Moe 776a7b7f74 allow adding details to externally uploaded video file 2020-07-25 23:15:24 -07:00
Moe cf91cf85ea Update Dashcam (Shinobi Streamer) data Input 2020-07-22 21:19:16 -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 93ee667f07 webServerPaths : fix some permissions and responses 2020-07-12 14:34:41 -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 9b18fb39ba sqlQuery Conversion : webServerPaths.js 2020-07-11 14:00:14 -07:00
Moe 5547ff0b25 Allow watching uploaded videos from Google Drive in Dashboard 2020-06-15 07:53:08 -07:00
Moe c004275fa8 put logger inside s.cameraControl callback 2020-06-13 11:27:46 -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 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 1269bfe08a refactor /events/ rows API method 2020-05-24 08:44:44 -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 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 d72b61f592 Add Basic Object Counting mechanism 2020-05-05 08:02:23 -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
Ian Rubado 00a883f127 Simplified even more. 2020-04-06 16:33:38 -04:00
Ian Rubado 2a22db2e55 Fix whitespace. 2020-04-06 16:16:19 -04:00
Ian Rubado 8b95989f97 No need to check req.query.streamtype contents, only need to know it exists and filter accordingly. 2020-04-06 16:14:23 -04:00
Moe 2260abbda4 clear two factor token on login 2020-04-05 20:31:01 -07:00
Ian Rubado e0284ede1e Fix whitespace 2020-04-05 23:28:00 -04:00
Ian Rubado f90329d015 Filter by streamtype for tv channel listing. 2020-04-05 23:26:03 -04:00
Moe 5308449979 send only essential data on 2FactorAuth 2020-04-05 19:51:12 -07:00
Moe 443b5565fe add "events" to Traditional Recording insertCompletedVideo request
- this will allow these kinds of recordings to provide a notification to the Mobile App upon completion
2020-03-05 11:12:54 -08:00
Moe e6144ef1c1 make HTTP Event Trigger and DropIn Trigger act for pass off to object detector 2020-01-17 23:20:16 -08:00
Moe 4a69a1aa8e adjust response headers
- make Access-Control-Allow-Origin : *
- add no-caching headers to streams over http
2020-01-15 13:47:59 -08:00