Commit Graph

2237 Commits (fa13e705623916efae01f3a442f2727670006d48)

Author SHA1 Message Date
Moe 374225de4c Merge branch 'dev' into 'dashboard-v3'
Update dashboard-v3 with latest dev backend changes

See merge request Shinobi-Systems/Shinobi!314
2021-06-14 23:29:28 +00:00
Moe f260011235 Merge branch 'dev' into 'master'
fix Cannot read property 'eventBasedRecording' of undefined

See merge request Shinobi-Systems/Shinobi!313
2021-06-14 19:55:59 +00:00
Moe 4c43e1e835 fix Cannot read property 'eventBasedRecording' of undefined+ 2021-06-14 11:28:27 -07:00
Moe cfc39dc95c fix Cannot read property 'eventBasedRecording' of undefined 2021-06-14 11:27:15 -07:00
Moe f9a15a7f65 Merge branch 'dev' into 'master'
Fix Account Save and Docker Configuration Persistence

See merge request Shinobi-Systems/Shinobi!312
2021-06-13 18:29:13 +00:00
Moe 5bd44e0be2 Update en_CA.js 2021-06-13 11:27:11 -07:00
Moe 5e8fb9996f revert package.json 2021-06-12 21:34:51 -07:00
Moe b2559980e8 fix side menu hidden sub items 2021-06-12 21:32:17 -07:00
Moe d3f6b01736 prettify selecting Input Map selection 2021-06-12 21:19:16 -07:00
Moe 0e82ecf113 cleanup Additional Input and Stream Channel field generation 2021-06-12 19:36:05 -07:00
Moe 6511d306fd Fix Docker image conf.json persistence 2021-06-10 21:21:59 -07:00
Moe 05ff09b32f again fixing package-lock.json 2021-06-10 21:14:39 -07:00
Moe 3cead62d46 fix saving Account Settings 2021-06-10 14:10:28 -07:00
Moe 13c161fd1b Update package-lock.json 2021-06-10 12:26:11 -07:00
Moe b1360b2397 add chai to package.json 2021-06-10 09:36:14 -07:00
Moe f9122e23af fix headers with buttons toggling 2021-06-09 22:26:43 -07:00
Moe 7de8363a59 fix wallclock timestamp toggler 2021-06-09 12:58:11 -07:00
Moe d33f8073cf fix pcm-boilerplate vulnerability+ 2021-06-09 12:54:38 -07:00
Moe ccaff73e01 Fix saving Subscription Key in first login 2021-06-09 12:52:34 -07:00
Moe 55f4002f85 Input Maps and Stream Channel buttons 2021-06-09 12:51:11 -07:00
Moe d9d93ea57a fix pcm-boilerplate vulnerability 2021-06-09 12:13:57 -07:00
Moe 985971da0f Merge branch 'dev' into 'dashboard-v3'
Over 9001

See merge request Shinobi-Systems/Shinobi!311
2021-06-08 19:13:32 +00:00
Moe 8d4023698d Merge branch 'dev' into 'master'
Over 9001

See merge request Shinobi-Systems/Shinobi!310
2021-06-08 19:09:42 +00:00
Moe 52558d4450 fix package-lock.json (fixes npm install in folder) 2021-06-08 12:07:33 -07:00
Moe 0387910328 change utf8mb4 to utf8 for Jetson Nano 2021-06-08 12:04:00 -07:00
Moe 7b75f23e96 Merge branch 'dev' into 'master'
Over 9000

See merge request Shinobi-Systems/Shinobi!308
2021-06-06 15:59:07 +00:00
Moe cd761a1569 Update super.configEditor.js 2021-06-04 11:13:26 -07:00
Moe 432802756e ubuntu-touchless always attempt node 12 install regardless of existing node 2021-06-04 08:37:31 -07:00
Moe dc727e3886 update liburls 2021-06-04 08:37:01 -07:00
Moe 1e5ea4b3e9 make event video notification use last recorded video made by event 2021-06-02 13:11:36 -07:00
Moe 1b356d6580 Update bs5.monitorsList.js 2021-06-02 11:29:16 -07:00
Moe 967eb42252 Merge branch 'dev' into 'dashboard-v3'
Fix package.json

See merge request Shinobi-Systems/Shinobi!309
2021-06-02 03:46:20 +00:00
Moe 0b531c94f5 Fix package.json 2021-06-01 20:35:28 -07:00
Moe a014b90a9a Dashboard V3 Integration begins 🎊 2021-06-01 20:19:22 -07:00
Moe 10f466c4a1 Update en_CA.js 2021-06-01 16:18:21 -07:00
Moe 9a5e45f325 Update en_CA.json 2021-06-01 12:56:07 -07:00
Moe 8f04f86a03 Update en_CA.js 2021-06-01 09:29:51 -07:00
Moe ed1865c3bf Update package-lock.json 2021-05-31 10:54:58 -07:00
Moe 1cbffe87ac Minor cleaning for discordBot.js 2021-05-31 10:52:18 -07:00
Moe ee455f009e Point node-ssh at git repo because npmjs version is broken
+ fix sftp always enabling even if disabled
2021-05-31 10:51:41 -07:00
Moe a777d55be8 have plugins return frame for re-use when triggered - yolo 2021-05-31 07:44:38 -07:00
Moe 41d49358fd Change console.logs to debugLog for coral plugin 2021-05-31 07:44:01 -07:00
Moe d3463947d3 have plugins return frame for re-use when triggered 2021-05-30 22:27:05 -07:00
Moe a3a71af679 Add Events List with Pics to Definitions (only for Dashboard v3) 2021-05-29 22:45:46 -07:00
Moe db9f9ff721 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2021-05-27 00:38:28 -07:00
Moe 51e5618360 Add Tensorflow plugin Docker Image 2021-05-27 00:38:20 -07:00
Moe 7a1a8313c1 Docker image for DeepStack Plugin 2021-05-27 00:02:05 -07:00
Moe 40c8ece611 make "Unexpected Exit" description more elaborate 2021-05-26 13:22:07 -07:00
Moe 4482211ee1 Merge branch 'FlingeR-master-patch-57729' into 'dev'
missing quotes and echo on openbsd.sh

See merge request Shinobi-Systems/Shinobi!306
2021-05-24 16:32:29 +00:00
Elias M. Mariani c6f5f77cc8 missing quotes and echo 2021-05-24 15:57:09 +00:00