Commit Graph

1144 Commits (7cd55de8013ba7ebefaf36721581cd31dfe5020a)

Author SHA1 Message Date
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 29cd083f0f Update help.ejs 2020-05-22 22:07:58 -07:00
Moe cafeed6b78 make plugin detectObject async and minor adjustments to help window 2020-05-22 22:06:48 -07:00
Moe 66c231016f Add more information to Help window, clean up a little 2020-05-21 11:02:16 -07:00
Moe 60af7da99b Update UPDATE.sh 2020-05-20 22:54:48 -07:00
Moe 0023faf9b8 Add proper language vars for ShinobiHub options 2020-05-20 22:51:32 -07:00
Moe f8d0d03eb8 Update shinobiHub.ejs 2020-05-20 22:47:53 -07:00
Moe 90ff600c26 Add searching ShinobiHub Explore (Uploaded and All) 2020-05-20 22:47:29 -07:00
Moe db7893643e make hub import use deep merge on default settings in case 2020-05-20 15:07:14 -07:00
Moe 58df790e97 mergeDeep added
mergeDeep is the same as Object.assign except it works upon multiple layers of an object
2020-05-20 15:06:39 -07:00
Moe 2ad0cae75f expand details column in default monitor object 2020-05-20 15:05:52 -07:00
Moe 4cb4276682 Basic ShinobiHub view window for user uploaded configurations 2020-05-20 14:03:45 -07:00
Moe 59becdfbff update JSON.parse to $.parseJSON in dash2.monitoredit.js 2020-05-20 14:02:55 -07:00
Moe 30496d88cc move top left menu to its own block 2020-05-20 14:01:56 -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
Moe 410a6de983 light touch up on timelapse performance and UI 2020-05-16 19:27:23 -07:00
Moe f110ca349e better timelapse playback, fix layout 2020-05-16 18:20:59 -07:00
Moe 05200181dc Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2020-05-16 13:01:17 -07:00
Moe 06b81cea22 refactor Timelapse code, fix date selection 2020-05-16 13:01:09 -07:00
Moe 9c7daa09a2 Merge branch 'dev' into 'dev'
Resolving a zombie ffmpeg process on linux under certain conditions.

See merge request Shinobi-Systems/Shinobi!190
2020-05-16 01:32:39 +00: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 c41c76dedc Update en_CA.js 2020-05-13 18:12:31 -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 f4079847c1 Add Custom > Object Detector Flags 2020-05-13 17:36: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 9ebd250d55 ignore .env for tensorflow plugin and create during install 2020-05-11 19:36:08 -07:00
Moe 35f3a6cfe9 Update ubuntu-touchless.sh 2020-05-11 18:51:17 -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 fd723664e3 remove deprecated plugins 2020-05-11 15:57:16 -07:00
Moe 9c566644a1 Convert to Packagable Syntax 2020-05-09 17:27:44 -07:00