Commit Graph

618 Commits (e474eba577698aea6b7920a0826a1c1647c1a88e)

Author SHA1 Message Date
Moe dc554481d4 silence query logs for `Files` table fix 2018-09-28 09:16:06 -07:00
Moe 24ed1b8dde add https to libs/webServer.js 2018-09-28 09:13:17 -07:00
Moe 040b9368eb Fix cron `Files` table bug 2018-09-28 09:13:03 -07:00
Moe af8fc608e7 Modularize camera.js 2018-09-27 22:37:08 -07:00
Moe 7134e06a9c Merge branch 'dev' into 'master'
re-add npm install

See merge request Shinobi-Systems/Shinobi!26
2018-09-26 17:42:44 +00:00
Moe 11b89e7ffb re-add npm install
- apparently nodejs installs npm only for some people
2018-09-26 10:41:28 -07:00
Moe 54fd9356dd Merge branch 'dev' into 'master'
Kid Flash

See merge request Shinobi-Systems/Shinobi!25
2018-09-25 23:07:12 +00:00
Moe c713e61341 Merge branch 'dev' into 'dev'
Fixed confidence value not being propagated in Web hooks URL

See merge request Shinobi-Systems/Shinobi!22
2018-09-25 23:03:29 +00:00
Moe 8ab159e94a Merge branch 'freebsd-cpu-ram-stats' into 'dev'
Adding ram and cpu stats commands for freebsd

See merge request Shinobi-Systems/Shinobi!24
2018-09-25 23:01:56 +00:00
Moe 1d3170b50e default password type to SHA256 for new installs 2018-09-25 15:59:29 -07:00
Moe 20733b3862 Contour Detection Plugin 2018-09-25 10:00:52 -07:00
Moe b7a3317aac Password Hashing with SHA256 and SHA512
- "passwordType" can be added to conf.json to use a hash other than md5.
- Options for passwordType : md5, sha256, sha512. md5 is default.
- Superuser will still be allowed to use MD5 passwords regardless of the "passwordType" selected in conf.json.
- To add salt to your SHA512 accompany the "passwordType":"sha512" with "passwordSalt":"". Fill it with your favorite salty secret.
2018-09-24 17:12:19 -07:00
Moe 45c9436a65 fix URL build for probe using port 80 2018-09-24 16:31:54 -07:00
Moe 1c56eb313a Send Screenshot on Event to Discord and Email without JPEG API enabled 2018-09-23 22:37:24 -07:00
Moe 8c1ee0a9c6 Brute Force Protection for Login 2018-09-23 21:10:20 -07:00
Moe a24b5e5d25 update "npm audit fix" 2018-09-23 08:43:29 -07:00
Moe e3890391bd Provide .mp4 on Event for Discord and Email Alerts instead of .ts+
- cleanup functions and fix pathing
2018-09-22 20:53:48 -07:00
Moe b75258bfc2 Provide .mp4 on Event for Discord and Email Alerts instead of .ts 2018-09-22 20:12:46 -07:00
Moe 2c5b5b8c80 Remove coProcessor
- CPU encoded data can now be created from CUDA decoded stream. Thanks Bogey!
+ prepare webpage streaming
2018-09-22 11:31:54 -07:00
Moe d56ecc8eb1 add missing Files table to SQL insert 2018-09-20 09:46:49 -07:00
Moe 95790d479b Update WebDAV Autosave for "Cloud Videos"
- WebDAV saving has been updated to work with the new "Cloud Videos" listing method.
- WebDAV folder structure will now be created automatically
+ remove some whtie spaces from settings.ejs
2018-09-16 00:51:20 -07:00
Moe 294055eaba Fix cron.js : Max Keep Days
- now main "Max Keep Days" excludes monitors with custom "Max Keep Days"
2018-09-15 13:31:03 -07:00
Moe 9bde8ba386 fix Skip Ping condition+ 2018-09-12 16:15:48 -07:00
Moe 4c081e2755 fix Skip Ping condition 2018-09-12 16:01:42 -07:00
Moe 0317fc017d fix typo in detector filter field draw 2018-09-11 21:38:40 -07:00
Moe 373752c914 Allow retrieving Cloud saved links from API and dashboard 2018-09-11 21:38:26 -07:00
Moe 38b0b75090 dlib plugin show object detection fields 2018-09-11 21:37:25 -07:00
Moe e580239490 remove sqlite3 and onvif-nvt from package.json 2018-09-11 21:36:47 -07:00
Moe 185173e40e add filtering events by time and action to modify indifference on filter event
- you can now set indifference based on time with the filter engine.
+ comment out onvif-nvt for now
2018-09-10 21:58:21 -07:00
teklabania 33a9152b17 Adding ram and cpu stats commands for freebsd 2018-09-09 20:49:10 +00:00
Moe 4253ae8c4d Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2018-09-02 10:00:25 -07:00
Moe fac6956f75 fix jpeg capture rate
+ make diskPurgedEmitter and diskUsedEmitter in one emitter with separate emit keys.
2018-09-02 10:00:18 -07:00
David Martin 5f431dfa66 Fixed confidence value not being propagated in Web hooks URL 2018-08-31 17:15:16 +02:00
Moe 5bb19c7d5e Merge branch 'dev' into 'master'
Blue Rhydon

See merge request Shinobi-Systems/Shinobi!21
2018-08-30 20:31:40 +00:00
Moe 81b46b699b Merge branch 'patch-1' into 'dev'
Added openSUSE installer scipt

See merge request Shinobi-Systems/Shinobi!20
2018-08-30 20:15:17 +00:00
Moe 384a89eb6a Replace Queue System for Disk Purge to Emitter System
- This should fix any lockups of the purging function as the queue is now handled by the emitter.
2018-08-29 10:29:51 -07:00
Moe 415343b4cc remove default plugin keys
- Now all new installs will need to manually add Plugin Keys for safety reasons
2018-08-29 10:28:10 -07:00
Moe d677f0e7d0 use cmake directly instead of python setup tools for dlib 2018-08-27 21:05:44 -07:00
Adam Radovits 0a69ba9a68 Small typo 2018-08-27 20:10:21 +00:00
Adam Radovits 698229a3f8 Small npm fix 2018-08-27 20:04:16 +00:00
Adam Radovits ab9f0ec4f4 NodeJS install fix 2018-08-27 20:02:02 +00:00
Adam Radovits fe2727efa7 Added OpenSUSE support 2018-08-27 19:52:05 +00:00
Adam Radovits d5f02b2cf9 Added OpenSUSE install script 2018-08-27 19:46:27 +00:00
Moe 0eaa16b19b Default Audio Codec = No for Traditional Recording with JPEG based inputs
+ minor comment and whitespace fixes/changes
2018-08-27 10:12:35 -07:00
Moe 12346601f8 New CUDA Installer 2018-08-26 20:06:17 -07:00
Moe 262207d12a remove 10 second checker and use -progress
+ method found in kevin's ffmpeg-streamer demonstration application.
2018-08-23 14:04:39 -07:00
Moe 1b00396d30 Force YOLOv3 plugin to use websocket between python and node
+ added new install requirements for YOLOv3 plugin. Please run "pip3 install gevent gevent-websocket" to install the required modules.
+ each monitor creates its own connection from the plugin to the python script.
2018-08-23 13:25:40 -07:00
Moe 83d148580d Face Recognition plugin added
- shinobi-python-dlib plugin
2018-08-23 13:17:10 -07:00
Moe 9483d216b2 lang updates 2018-08-23 13:10:40 -07:00
Moe 514413975c check monitor process life status every 10 seconds 2018-08-23 13:10:28 -07:00