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

1292 Commits (21ea4d804f708edd7a26912410cb630b15db15b4)

Author SHA1 Message Date
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
Moe 4aa25f995a Merge branch 'filter_email_send_fix_dev' into 'dev' 
Allow detector filters to send emails without a monitor global detector setting of sending email being set.

See merge request Shinobi-Systems/Shinobi!212
 2020-07-07 21:06:22 +00:00
Moe 6fbd85ce51 Merge branch 'tensorflow_modelUrl_support' into 'dev' 
Added modelUrl support to tensorflow plugin.

See merge request Shinobi-Systems/Shinobi!213
 2020-07-07 21:02:57 +00:00
Ian Rubado 81ac3bd1ea Added modelUrl support to tensorflow plugin. 2020-07-06 17:56:51 -04: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
Moe 25eb41596d Update help window 2020-06-27 22:39:44 -07:00
Moe 905f5f6b1e Merge branch 'dev-new-feature-test-object-match-count' into 'dev' 
Dev new feature test object match count

See merge request Shinobi-Systems/Shinobi!209
 2020-06-27 18:46:06 +00:00
dennis.cartier 58c5796d4b Switch logging to user log from system 2020-06-27 14:40:43 -04:00
Moe b384664807 Merge branch 'dev-bugfix-global-drop-activation' into 'dev' 
Dev bugfix global drop activation

See merge request Shinobi-Systems/Shinobi!208
 2020-06-27 17:29:19 +00:00
dennis.cartier 5ddfbcb5d3 Add support for testing count of matched objects 2020-06-26 05:43:36 -04:00
dennis.cartier ab33d2436d Fix test for filter presence 2020-06-26 05:07:36 -04:00
Moe 5c19166125 Merge branch 'dev-fix-detector-motion-counts' into 'dev' 
Fix detector motion counts being inserted into monitor object too early

See merge request Shinobi-Systems/Shinobi!207
 2020-06-24 21:10:34 +00: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 efc1374d0d Update tables.sql 2020-06-18 16:29:40 +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
Mike Hurley 6c7ef92a38 Update tables.sql to include indexes on Events, Logs, and Videos tables 2020-06-17 16:45:16 +00: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
Moe 44b7868d6a Fix duplicated column in sql framework 2020-06-14 10:01:59 -07:00
dennis.cartier 9c1c3bb168 Merge branch 'dev-region-testing' of gitlab.com:dennis.cartier/Shinobi into dev-region-testing 2020-06-14 06:59:58 -04: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