ac516980bb
separate uploadToDav and uploadToAmazonS3 from insertCompletedVideo
...
+ add missing "lang" to socketio and videos modules
2018-09-29 13:40:07 -07:00
d5cabef179
light function cleanup
2018-09-29 13:09:47 -07:00
19a24f5f38
cleanup ffmpeg check and add ffbinary usability
...
- run npm install ffbinaries to use that downloader instead.
- ffmpeg-static and ffbinaries should get the same version just get them in a different way.
2018-09-29 13:09:24 -07:00
9393c8caf7
Modularize camera.js+++++++
...
- clean up some more functions names to be more human readable.
2018-09-29 08:00:51 -07:00
7431aee9fc
Modularize camera.js+++++
2018-09-28 21:04:50 -07:00
91f5451c6e
Re-add !24
...
+ move s.processReady
2018-09-28 20:06:32 -07:00
3efbfae9bb
move ffmpeg functions
2018-09-28 19:09:14 -07:00
f4b544c52c
change var name from currentDirectory to mainDirectory
...
- "mainDirectory" better reflects the value of the variable
2018-09-28 19:02:53 -07:00
d834698b27
default custom JSON stringify function to pretty print, 3 spaces
2018-09-28 18:57:26 -07:00
e226327439
add fs to webServer.js lib
2018-09-28 18:39:35 -07:00
1740e3461d
break s.init into individual functions
2018-09-28 18:38:14 -07:00
dd3858e94e
Modularize camera.js+++
2018-09-28 13:26:24 -07:00
2b4dcd8694
silence query logs for `Files` table fix+
2018-09-28 09:18:49 -07:00
dc554481d4
silence query logs for `Files` table fix
2018-09-28 09:16:06 -07:00
24ed1b8dde
add https to libs/webServer.js
2018-09-28 09:13:17 -07:00
040b9368eb
Fix cron `Files` table bug
2018-09-28 09:13:03 -07:00
af8fc608e7
Modularize camera.js
2018-09-27 22:37:08 -07:00
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
11b89e7ffb
re-add npm install
...
- apparently nodejs installs npm only for some people
2018-09-26 10:41:28 -07:00
54fd9356dd
Merge branch 'dev' into 'master'
...
Kid Flash
See merge request Shinobi-Systems/Shinobi!25
2018-09-25 23:07:12 +00:00
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
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
1d3170b50e
default password type to SHA256 for new installs
2018-09-25 15:59:29 -07:00
20733b3862
Contour Detection Plugin
2018-09-25 10:00:52 -07:00
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
45c9436a65
fix URL build for probe using port 80
2018-09-24 16:31:54 -07:00
1c56eb313a
Send Screenshot on Event to Discord and Email without JPEG API enabled
2018-09-23 22:37:24 -07:00
8c1ee0a9c6
Brute Force Protection for Login
2018-09-23 21:10:20 -07:00
a24b5e5d25
update "npm audit fix"
2018-09-23 08:43:29 -07:00
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
b75258bfc2
Provide .mp4 on Event for Discord and Email Alerts instead of .ts
2018-09-22 20:12:46 -07:00
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
d56ecc8eb1
add missing Files table to SQL insert
2018-09-20 09:46:49 -07:00
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
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
9bde8ba386
fix Skip Ping condition+
2018-09-12 16:15:48 -07:00
4c081e2755
fix Skip Ping condition
2018-09-12 16:01:42 -07:00
0317fc017d
fix typo in detector filter field draw
2018-09-11 21:38:40 -07:00
373752c914
Allow retrieving Cloud saved links from API and dashboard
2018-09-11 21:38:26 -07:00
38b0b75090
dlib plugin show object detection fields
2018-09-11 21:37:25 -07:00
e580239490
remove sqlite3 and onvif-nvt from package.json
2018-09-11 21:36:47 -07:00
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
33a9152b17
Adding ram and cpu stats commands for freebsd
2018-09-09 20:49:10 +00:00
4253ae8c4d
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2018-09-02 10:00:25 -07:00
fac6956f75
fix jpeg capture rate
...
+ make diskPurgedEmitter and diskUsedEmitter in one emitter with separate emit keys.
2018-09-02 10:00:18 -07:00
5f431dfa66
Fixed confidence value not being propagated in Web hooks URL
2018-08-31 17:15:16 +02:00
5bb19c7d5e
Merge branch 'dev' into 'master'
...
Blue Rhydon
See merge request Shinobi-Systems/Shinobi!21
2018-08-30 20:31:40 +00:00
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
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
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
teklabania
David Martin