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

1973 Commits (f9c41c4fc7c9136a356b3cac08bc45fa231aba75)

Author SHA1 Message Date
Moe f20a992969 Fix database designation for docker image 2021-03-27 07:27:04 -07:00
Moe 378e7399f9 Merge branch 'dev' into 'master' 
Minor Cleanup

See merge request Shinobi-Systems/Shinobi!294
 2021-03-27 13:58:41 +00: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 c4d5b78339 Merge branch 'dev' into 'master' 
Minor Fixes

See merge request Shinobi-Systems/Shinobi!291
 2021-03-05 16:24:18 +00: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 862503522f Merge branch 'dev' into 'master' 
Fix cron.js monitorId declaration error

See merge request Shinobi-Systems/Shinobi!287
 2021-02-19 16:43:40 +00:00
Moe Alam 876b4c4d45 Fix cron.js monitorId declaration error 2021-02-19 08:41:27 -08:00
Moe 11ad5798a7 Merge branch 'dev' into 'master' 
Critical Fixes and Updates

See merge request Shinobi-Systems/Shinobi!286
 2021-02-19 15:28:18 +00: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
Mitch Ross fa5245156c Clean up detect_image, add comments. Remove unnecessary code. 2021-02-07 19:57:42 +00:00
Moe Alam 7277e802b6 Sub-Account Manager : begin rewrite (the move from /admin to /) 2021-02-06 20:45:26 -08:00
Moe Alam 328848b850 cron.js : clean up processing recursion 2021-02-06 09:34:33 -08:00
Moe Alam 4167d61097 cron.js : clean up days selected 2021-02-06 09:21:09 -08:00
Moe Alam 7a00470f7c fix log message for deleteOldVideo 2021-02-06 08:11:59 -08:00
Moe Alam a66492b871 cron.js updates storage used when deleteOldVideos 2021-02-05 19:13:12 -08:00
Moe Alam bf1d78235b make all deleteOldVideos actions occur in cron.js, promisify cron funcs 2021-02-05 17:36:10 -08:00
Moe Alam cd15b95d34 re-arrange face plugin installer order 2021-02-05 08:24:43 -08:00
Moe Alam 8518c2c2ef fix default dimensions for drawMatrices function 2021-02-05 08:24:00 -08:00
Moe Alam 684afc7821 clean up import montiors confirm window code 2021-02-05 08:23:42 -08:00
Moe 3a4a405e1c Merge branch 'dev' into 'cron.js-update' 
# Conflicts:
#   cron.js
 2021-02-05 16:16:07 +00:00
Moe Alam 7a5b97ce7c update face plugin to use tfjs 1.7.4 2021-02-01 10:01:27 -08:00