Commit Graph

1879 Commits (74f9f280707037de42db5cf8eb2a719565126da7)

Author SHA1 Message Date
Moe 74f9f28070 add LoginTokens table creation (for existing installs being updated) 2021-04-03 09:48:00 -07:00
Moe b57f82290f Update framework.sql 2021-04-03 09:47:20 -07:00
Moe adf3d1c8e9 alternate login engine, add google sign-in 2021-04-02 22:14:34 -07:00
Moe 62177e886d partial rewrite for login post handler
+ make streamer and dashcam get monitors list from API rather than page write
2021-04-02 18:23:21 -07:00
Moe e9ee4aca8b add get for conf.json by api and make config update POST only 2021-04-01 22:41:39 -07:00
Moe aa4192b6fe rewrite superLogin for initial login, create base for other login types 2021-04-01 22:40:37 -07:00
Moe 76f02de24e make Super page use API to get Admin list and System Logs+ 2021-04-01 15:50:02 -07:00
Moe 2ae9bcaaf0 make Super page use API to get Admin list and System Logs 2021-04-01 15:49:35 -07:00
Moe ee45ef3f1a fix Super Log API endpoint 2021-04-01 15:44:32 -07:00
Moe c20cf9113a google login test framework 2021-03-31 23:03:34 -07:00
Moe 40d172e52c Fix Reolink RTMP restart bug, fix undefined codec array 2021-03-31 11:01:05 -07:00
Moe ad27f9ee2f fix detector buffer custom flag build 2021-03-29 12:06:33 -07:00
Moe f4d00ba6cd Default failed addStorage detection to null 2021-03-29 11:37:13 -07:00
Moe e852ca0ee6 Merge branch 'dev' into 'dev'
Enable PASV mode support for the FTP server.  Required by some cheap cameras.

See merge request Shinobi-Systems/Shinobi!295
2021-03-28 21:26:44 +00:00
Nunya Bidnezz 471d81e501 Enable PASV mode support for the FTP server. Some cheap Dahua imports require PASV mode when sending FTP event notifications. 2021-03-28 13:04:42 -05:00
Moe 91702d4d3c fix addEventDetailsToString undefined 2021-03-27 13:04:01 -07:00
Moe f20a992969 Fix database designation for docker image 2021-03-27 07:27:04 -07:00
Moe 0d38d9ecaa Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2021-03-27 06:56:56 -07:00
Moe f5edc26808 empty confirm window when closed 2021-03-27 06:56:48 -07:00
Moe af69666d8b send headers in P2P bridges as well 2021-03-27 06:56:32 -07:00
Moe 880f8e6350 error catching parse for db row details parsing 2021-03-27 06:56:00 -07:00
Moe 514a3ca00e Update Node Fetch in package.json 2021-03-27 06:55:23 -07:00
Moe ad0508e2f8 force 2.7.0 install for tensorflow plugin 2021-03-27 06:53:58 -07:00
Moe 794dd20c10 Merge branch 'bracket-mismatch-fix' into 'dev'
Fix bracket mismatch in INSTALL/shinobi

See merge request Shinobi-Systems/Shinobi!293
2021-03-20 14:59:30 +00:00
Alex Roy 872b68922b Fix bracket mismatch in INSTALL/shinobi 2021-03-20 14:15:03 +00:00
Moe af2c12d059 Merge branch 'dev' into 'dev'
Specify DB_DATABASE in docker init script.

See merge request Shinobi-Systems/Shinobi!292
2021-03-10 22:36:51 +00:00
Otto Hollmann 33a0fd9c00
Specify DB_DATABASE in docker init script. 2021-03-10 22:55:09 +01:00
Moe Alam 74bbf51042 Update Docker base node version, remove audit line (causes exit 1) 2021-03-05 08:21:32 -08:00
Moe Alam 1ef74e5201 fix checking matrix in region 2021-02-27 08:39:17 -08:00
Moe Alam 876b4c4d45 Fix cron.js monitorId declaration error 2021-02-19 08:41:27 -08:00
Moe Alam 36dc9f932d Fix Superuser Penetration Bug (properly) 2021-02-19 07:25:36 -08:00
Moe Alam a12d36692b Update en_CA.json 2021-02-19 07:12:04 -08:00
Moe Alam 43889776b9 Fix Superuser Penetration Bug 2021-02-19 07:02:54 -08:00
Moe a8a7f0d991 Merge branch 'cron.js-update' into 'dev'
cron.js update

See merge request Shinobi-Systems/Shinobi!249
2021-02-12 19:13:49 +00:00
Moe Alam d991516ddf Fix frame deletion (allow row delete if file does not exist) 2021-02-11 09:45:05 -08:00
Moe Alam ad63222730 cron.js : reset interval to 1 day 2021-02-09 10:11:03 -08:00
Moe Alam b23728d74e cron.js : add some error handling for new file deletion 2021-02-09 08:32:11 -08:00
Moe Alam 2a356f696e API Keys Manager : fix duplicated rows in UI 2021-02-09 05:45:43 -08:00
Moe Alam a425701e29 API Keys Manager : clean up interface layout 2021-02-08 20:45:35 -08:00
Moe Alam 4ac4c60d18 API Key Manager : clean up code and some fixes 2021-02-08 09:43:46 -08:00
Moe 9ad9d48d38 Merge branch 'dev' into 'dev'
Fix Tensorflow Coral Bounding Box Issues

See merge request Shinobi-Systems/Shinobi!284
2021-02-08 16:53:49 +00:00
Mitch Ross e8fdfcc9f5 Merge branch 'dev' into 'dev'
# Conflicts:
#   plugins/tensorflow-coral/detect_image.py
2021-02-08 16:03:07 +00:00
Moe f06602b1cb Merge branch 'technokami-dev-patch-07683' into 'dev'
fix minor typo - "Enter atleast one IP" to "Enter at least one IP"

See merge request Shinobi-Systems/Shinobi!281
2021-02-08 15:19:50 +00:00
Mitch Ross 9d7bd31068 Fix math on bounding box drawing logic. 2021-02-08 15:03:25 +00:00
Moe Alam 90685806df Sub-Account Manager : password clear on edit and reset 2021-02-07 16:25:37 -08:00
Moe a1308c5211 Merge branch 'sub-account-manager-rewrite' into 'dev'
Sub-Account Manager Rewrite

See merge request Shinobi-Systems/Shinobi!283
2021-02-07 22:06:01 +00:00
Moe Alam 6af17c4392 Sub-Account Manager : color updates 2021-02-07 13:52:55 -08:00
Moe Alam 1ac929fb82 disable old admin page 2021-02-07 13:46:23 -08:00
Moe Alam 94a51ad17b Sub-Account Manager : cleanup 2021-02-07 13:34:48 -08:00
Moe Alam f18b184dca Sub-Account Manager : saving, editing, and create new working 2021-02-07 12:03:17 -08:00