Commit Graph

326 Commits (57d2e3879df55bfafa184e1d9c457651784d3725)

Author SHA1 Message Date
Moe 62f2dab693 add Open All Monitors to menu 2020-01-10 15:39:44 -08:00
Moe ed76347b25 Add Webhook and Command to No Motion Detector 2019-10-31 22:02:14 -07:00
Moe 115752820d Update No Motion Detector; Add Discord Notification 2019-10-31 17:26:52 -07:00
Moe ccc98803b8 Add 1 Week Hider for the Popup window 2019-10-27 08:49:04 -07:00
Moe f594d510b9 Add Snapshot Delay for Discord and Email Notification on Event 2019-10-02 19:25:43 -07:00
Moe a2dcccd9b9 fix monitor import base object
+ add copy stream channels
2019-09-23 15:58:33 -07:00
Moe 276773bc61 add frame minimum (30 frames) to timelapse mp4 builder 2019-09-07 23:19:21 -07:00
DewGew ad93dabe1a Merge branch 'dev' into 'patch-2'
# Conflicts:
#   languages/sv_SE.json
2019-08-29 11:25:57 +00:00
DewGew fd7487fca8 Update sv_SE.json 2019-08-29 11:23:48 +00:00
Moe ee3d1d21b3 Merge branch 'patch-3' into 'dev'
Fixes for multimon.ejs, lang vars, move/labels

See merge request Shinobi-Systems/Shinobi!101
2019-08-28 15:02:37 +00:00
Moe d117ba00f9 Merge branch 'Add-lang-vars' into 'dev'
Added language variables

See merge request Shinobi-Systems/Shinobi!94
2019-08-28 15:01:06 +00:00
DewGew 7d4b4d6326 Update en_CA.json 2019-08-19 13:25:50 +00:00
DewGew c589cbba6b Update sv_SE.json 2019-08-19 08:38:04 +00:00
DewGew 39d1902d01 Update en_CA.json 2019-08-19 08:36:05 +00:00
DewGew 8ed43a9404 Update sv_SE.json 2019-08-19 07:39:05 +00:00
Moe 9993593e2e Merge branch 'patch-1' into 'dev'
Added translation on Clock

See merge request Shinobi-Systems/Shinobi!95
2019-08-19 06:59:02 +00:00
Moe 729139591b Merge branch 'lang-ru' into 'dev'
Russian language update

See merge request Shinobi-Systems/Shinobi!100
2019-08-19 06:57:39 +00:00
Moe beffc10ab4 Merge branch 'patch-3' into 'dev'
Added language vars to folder.js

See merge request Shinobi-Systems/Shinobi!97
2019-08-19 06:28:20 +00:00
Oleg Vivtash 7cc09bab19 Russian lang file update 2019-08-18 13:53:47 +03:00
Moe 0434620ec8 Add Zoom In Magnifier to live stream and Power Video
+ adjust logWriter flood check timeout
+ minor cleanup (removing ";" just for you @kevinGodell)
2019-08-16 13:19:22 -07:00
DewGew 594ca5fa24 Update sv_SE.json 2019-08-13 13:31:17 +00:00
DewGew 81d010a27b Added "No Sound" en_CA.json 2019-08-13 08:05:24 +00:00
DewGew 23f6965446 Update sv_SE.json 2019-08-13 07:20:28 +00:00
DewGew 5198b471df Update sv_SE.json 2019-08-13 05:42:17 +00:00
Moe 55b8aafb0f minor cleanup and fixes 2019-08-12 15:23:11 -07:00
DewGew 1818fb4964 Added month 2019-08-09 07:47:28 +00:00
DewGew 634755a508 Update sv_SE.json 2019-08-09 07:01:10 +00:00
Moe 791a281f88 make "Zip and Download" a client side interaction 2019-08-05 23:38:36 -07:00
Moe ae01eb53c4 Merge branch 'dev' into 'dev'
Added swedish language and fix some languages vars in front end

See merge request Shinobi-Systems/Shinobi!83
2019-08-04 15:35:59 +00:00
Moe 811941310c Update Power Video Viewer to Version 5
- The return of vis.js for the Power Video Viewer. Now you are able to view multiple monitor's videos at a single time. Control speed
+ move confirm window js
+ remove some extra files
2019-08-03 23:49:34 -07:00
DewGew b8b5210870 Update sv_SE.json 2019-08-02 11:40:02 +00:00
DewGew 9dc53411cb Update sv_SE.json 2019-08-02 11:18:30 +00:00
DewGew 307bbd8cb1 Update sv_SE.json 2019-08-02 10:25:21 +00:00
DewGew 964c7e7af9 Update sv_SE.json 2019-08-02 10:17:21 +00:00
DewGew 0edbb7f277 Update sv_SE.json 2019-08-02 10:08:50 +00:00
DewGew c18f22d105 Update sv_SE.json 2019-08-02 07:17:02 +00:00
DewGew cff2eecda9 Update sv_SE.json 2019-08-01 07:44:10 +00:00
DewGew 0ddc61fc6b Added swedish language 2019-08-01 06:23:10 +00:00
Moe 2787883ea6 Add FileBin Space Calculator
+ make timelapse range queries have time as well
2019-07-26 08:18:24 -07:00
Moe c31d3bfebd Update Scheduling Manager
- Add selection for Days of the week
- Add Timezone selector
- cleanup schedule.js
2019-07-23 22:06:23 -07:00
Moe d0adfcc1ff Update HTTP Motion Trigger
- Make it a JSON response
- Add ability to Block it with a switch
2019-07-14 18:02:15 -07:00
Moe 0d5ce06fa1 Update en_CA.json 2019-07-07 21:45:23 -07:00
Moe 63ded4d92c Add async.queue to s.sqlQuery, fs.readFile and fs.stat
+ change backblaze human name accountId to keyId
2019-06-20 22:42:17 -07:00
Moe c8f38b0d2f minor cleanup 2019-06-04 09:39:36 -07:00
Moe a87c2e6acc Compound Update
- Calculate Max Storage Amount for Videos and Timelapse Frames separately
- Split Max Storage Amount by percentage for Videos and Timelapse Frames
- Fix order of operations for on start monitor load and orphan check
- move some extender definitions to extenders.js
- Slim Power Video Viewer event bars
- Add hours to date range selector for Timelapse Jpeg
2019-05-05 13:30:07 -07:00
Moe a1f33195ee clear "over max" timelapse frames 2019-04-26 11:10:53 -07:00
Moe ec8824985f Packging, addStorage Max Amounts, Fix s3uploader and minor fixes
- Add ability to pacakge with `pkg`
- Add Max Storage Amount for each `addStorage` storage array per user
- Fix `uploaders/s3based.js` variable names
- Update Timelapse.jpeg video builder
- Allow rendering a separate page upon login for Sub-Accounts
2019-04-18 17:54:07 -07:00
Moe 89a70b6438 Some Updates and Fixes
- Add Branding Engine
- Lock PM2 install to 3.0.0 (newer versions cannot catch `uncaughtException`.
- Update macOS installer
- Update OpenALPR (CPU) installer
- Add Portuguese Language
- Fix Language Selector
- Lay-In ability to create Matrix from Pam-Diff detection blob
- createEventBasedRecording called for Traditional Recording labelled 5 seconds before real time to capture event
- fix NaN for new user created in Superuser
- count space used for Timelapse Frames and Files tables (does not purge Timelapse data yet)
- Update TimelapseJpeg, lay-in MP4 builder, many fixes, additonal page
- add `impervious` to gitignore in `web/libs` for custom static files
- Fix delete button for quick video list
- Fix Super form appearance
2019-04-02 20:47:03 -07:00
Moe bcdb54d02b Modify JPEG-Based Timelapse Method and add basic GUI
+Bug fixes for UI
2019-03-23 18:25:58 -07:00
Moe 00ab3046ff Add JPEG-based Timelapse creation
- Currently can only retrieve data about Timelapse through API, GUI coming soon
+ Definition fixes
2019-03-21 14:30:50 -07:00
Moe 758fc700b1 Rewrite Settings and Montior Edit forms in JSON instead of HTML
- rewrite of forms in JSON allow auto-generating the necessary fields on almost any template with a lot more ease
- remove ejs files for uploaders and make fields generate by JSON as well
+ activate separated css files
2019-03-15 00:32:18 -07:00
Moe 8fe57162af Feature Request #49 : Custom Endpoint with S3-Based Uploading
- Wasabi Hot Cloud Storage has been converted to being a dynamic S3-based upload controller.
2019-03-07 15:53:49 -08:00
Moe d6f83fff27 Merge branch 'master' into 'dev'
# Conflicts:
#   languages/fr.json

(and this is why we never do Merge Requests directly to the master branch.)
2019-03-06 16:50:46 +00:00
Moe 4fdda23245 Add new language variables 2019-02-27 20:16:15 -08:00
Moe 303af1771e Merge branch 'undefined' into 'dev'
Czech language initial, updates will follow

See merge request Shinobi-Systems/Shinobi!51
2019-02-22 19:36:17 +00:00
Moe 6ee59e6357 Merge branch 'patch-2' into 'dev'
Update fr.json

See merge request Shinobi-Systems/Shinobi!52
2019-02-22 19:35:28 +00:00
Moe d8fd16c033 humanize and cleanup cloudUploader.js
+ add privateKey field for SSH file upload
2019-02-19 22:31:07 -08:00
Moe 6a3daccb2f Add Automatic SFTP Uploader
- SFTP Uploader is basic uploader. This method is not capable of managing space like other cloud back up methods.
+ Minor cleanup
2019-02-19 19:29:12 -08:00
Moe 89bbbf4330 Bug Fix for Detector flag building 2019-02-16 14:56:46 -08:00
Moe bdbf3458b6 Add Wasabi Hot Cloud Storage in cloudUploaders.js 2019-02-04 10:37:22 -08:00
hartigoon1 8811c0bd8b Update fr.json 2019-01-31 02:23:21 +00:00
Jan Švejdík d51c858040 Czech language initial, updates will follow 2019-01-29 23:11:32 +00:00
Moe 75269f7d9f Method to merge videos from Videos List
- button will appear as "Merge and Download" next to "Zip and Download"
2019-01-28 17:41:14 -08:00
Moe f9450a58dd Humanize configuring Notification Video Length
- Notification Video Length : The length of the video that gets sent to your Notification service, like Email or Discord.
- New option appears under Recording Timeout.
2019-01-28 12:25:43 -08:00
Moe 8bccd65fa1 Merge branch 'dev' into 'master'
Tabantha Frontier

See merge request Shinobi-Systems/Shinobi!49
2019-01-27 23:22:34 +00:00
Moe a60d9ecd73 update customAutoLoad
- allow addition static files, blocks, css, js, and language files without modifying the core
2019-01-26 20:43:31 -08:00
hartigoon1 f7c33190ae Update fr.json 2019-01-26 14:47:09 +00:00
Moe daeda7f970 minor cleanup 2019-01-23 22:15:29 -08:00
Moe 107893d058 Hourly check for possible stale sizePurge lock 2019-01-22 21:43:10 -08:00
Moe 79e3632b88 Return of the coProcessor
- now is optional and can be enabled in the Input section.
+ add humanized log for "error while decoding", mention network performance issues
2019-01-22 20:09:20 -08:00
Moe 715b0e54cc Add Custom Flags field for Traditional Recording 2019-01-22 08:44:32 -08:00
Moe 1ccad1dcde Update super.ejs and minor cleanup
- add notice for group key in /super if used more than once.
2019-01-12 10:57:21 -08:00
Moe f0f04d7b46 Monitor States and Schedules GUI
- Can be found by clicking the Main Menu. "Monitor States" and "Schedules".
- To use Schedules you must make a Monitor States Preset first.
2018-12-31 11:11:41 -08:00
Moe afdc0cf568 Audio Detector, Detect Object in Region, and API Methods for Scheduling System
- Audio Detector measures decibels (dB). Section can be found under Motion Detection.
- Regions can now be used with Object detection alone, find the option the Object Detection section.
- Scheduling System will allow automatically activating Monitor States based on time. GUI will be posted in the next commit.
+ Update Installers
+ Update framework.sql
+ `npm test` will run the test
+ Minor Bug Fixes
2018-12-29 11:32:12 -08:00
Moe f57250e25e Add "codeTester" module (Not Complete)
- Merge test functions into main app and invoke based on 1 of 2 Methods.
- Method 1 : Add `"testMode":true` to conf.json to start Shinobi in Test Mode.
- Method 2 : run `node camera.js test` in the Shinobi folder.
- CTRL+C to exit process and cleanup test files.
+ Code cleanup and bug fixes (found while testing the codeTester module)
+ Update "Entire System Export"
+ Additional Extenders
+ Make Input Map default "0" instead of "0:0"
+ Remove extra Whitespace from LICENSE and update the "Modification of this Software Product.".
2018-12-16 16:54:06 -08:00
Moe b0523293c1 Allow Disabling the Thumbnail for Videos List 2018-12-13 11:56:05 -08:00
Moe c91ce87ec7 Additional Extenders 2018-12-04 08:34:43 -08:00
Moe 950dd9bf37 Make Built-In Motion Detector Matrix optional 2018-11-15 10:29:23 -08:00
Moe a0ec9afc87 Allow Mass Config Changes by API (monitorStates) and more
- Unlike /configureMonitor/ this method, /monitorSates/, can take single veriables for a monitor edit.
+ clean /configureMonitor/'s addEdit portion and make it a separate function
+ add "raw" catch. if "raw" not found another database init will be requested
+ fix "undefined" monitor status for Disabled monitors on Shinobi start
+ fix color threshold save for region editor
+add fallback for snapBuffer failure
2018-11-10 19:59:02 -08:00
Moe 4c0cf2b3a3 fix cron.js SQLite-deleteOld bug
+ make cron video deletes happen in bulk rather than 1 query per video
+ clear eventBaseRecording timeout to avoid fallback action after success
+make non-python yolo show object detection section, remove python-yolo
2018-11-05 12:55:58 -08:00
Moe f3d60ca674 Additions and Cleanup
+ Allow global designation for Backblaze B2, Amazon S3, and WebDAV
+ allow frame transfer to plugin by "File in RAM" (experimental and currently only works with yolo and dlib)
+ API method for account save/edit
+ Add C++ based Dlib plugin (face-recognition)
+ allow choosing tiny or regular weights for yolo
- remove old python-dlib plugin because it is just bad (yucky python)
2018-11-02 16:44:53 -07:00
Moe f605c7adc7 Thumbnails for Video List
- client-side generated thumbnails.
+ light cleanup and bug fixes on childNode engine
2018-10-19 14:15:40 -07:00
Moe 00c6a2c025 light updates
- adjust static-ffmpeg check
- make inital monitor load synchronous
2018-10-10 16:10:59 -07:00
Moe f2797cdb0b s.orphanedVideoCheck added
- "config.cron.deleteOrphans" has been removed. It has been replace by a one-time-run at startup with "config.insertOrphans". As the variable name suggests, instead of deleting, it will insert videos found without a database row.
- By default "config.orphanedVideoCheckMax" will only check up to 20 video. You can raise this value to any number you choose but be careful as it will check that number of videos on every start.
- this function also runs if a camera exits unexpectedly.
2018-10-09 23:56:13 -07:00
Moe ec3e3ddd35 Check Hardware Acceleration methods on start
- show only available methods in client side
2018-10-09 16:25:16 -07:00
Moe c178984084 Add CPU usage indicator (per monitor)
+ adjust purge videos on max space operation order
+ light cleanup with var names
2018-10-09 15:40:06 -07:00
Moe d9912bacdf Fix "File Delete Error" caused by permission issue
- Temporary fix until approriate one is found
2018-10-08 14:43:31 -07:00
Moe febca865fa RESTful API methods Superuser 2018-10-05 14:19:29 -07:00
Moe 506c6a614e Add Color Threshold for Built-In Motion Detector 2018-10-02 22:00:00 -07:00
Moe 2cab29311f Merge branch 'detector-stuff' into 'dev'
Added max_sensitivity at the region and global levels which puts a cap on…

See merge request Shinobi-Systems/Shinobi!12
2018-10-03 03:52:42 +00:00
Moe fa2f27dde0 Superuser GUI to change user and password
+ ability to modify Admin user emails
2018-10-02 17:52:20 -07:00
Michael Sandrof 94d21ed0a2 Added max_sensitivity at the region and global levels which puts a cap on detections that can trigger an event.
Added detection threshold that requires a minimum number of detections before triggering an event.
2018-10-01 19:37:43 -07:00
Moe a3744787d9 Mega Update
- Add Extender functions in some places. Hopefully will add in all functions after more rewriting.
- Add Backblaze B2 uploading support
- Add support for managing cloud storage space used
- put all cloud video management functions in one library file using Extender
- separate uses of "s.s". s.s = JSON.stringify again and API calls with s.s will use "s.prettyPrint"
- move ffmpeg init functions
- rename s.beat to better reflect purpose
2018-09-30 15:44:04 -07:00
Moe afbd2f7172 humanize more code
- libs/startup.js should be easy to read now
- some comments in libs/videos.js
- make specific function for preQuery stuff
- add win64 to isWin check
- clean up startupText values
2018-09-29 16:03:55 -07:00
Moe 8c1ee0a9c6 Brute Force Protection for Login 2018-09-23 21:10:20 -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 373752c914 Allow retrieving Cloud saved links from API and dashboard 2018-09-11 21:38:26 -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
Moe 9483d216b2 lang updates 2018-08-23 13:10:40 -07:00
Moe 9166d7e8a9 H.265 Stream Type Added
- Now play H.265 video in almost any browser with the help of libde265.js!
+ minor bug fixes
+ preparation for slickslider page (timed switcher)
2018-08-20 23:07:08 -07:00
Stephen Wood 9acb0ed751 Add support for Raspberry Pi encoding/decoding. 2018-08-15 15:16:15 -07:00
Moe eb0796ca1a use request() for webhook on event 2018-08-12 17:44:12 -07:00
Moe adb07b403b 2-Factor Authentication can use Discord 2018-08-12 11:06:56 -07:00
Moe 160ee3c21c Monitor Popout on Event option 2018-08-09 08:46:04 -07:00
Moe 429c2fe64b allow motion events to skip the filter 2018-08-08 21:52:10 -07:00
Moe 3639b7b622 Detector Plugin Filtering Engine 0.1 2018-08-07 21:07:19 -07:00
Moe 971ecc513a Preparation for ONVIF Events (Profile T cameras only) 2018-08-02 22:58:28 -07:00
Moe fab0839cd2 Minor bug fixes and additional table for "Cloud Videos"
- fixed Superuser editing a user caused user settings to be destroyed
- added Cloud Videos table for Amazon S3 and future Cloud Based Storage
- Added error handler for Discord message bot
2018-07-24 22:24:14 -07:00
Moe 1b141bb3c3 remove extra amazon s3 log and log error only 2018-07-23 22:51:23 -07:00
Moe 2bd790545b Amazon S3 upload on video complete
- Open "Settings" in the "Admin" account (sub-account creator) to reveal your Amazon S3 configuration fields.
2018-07-23 22:33:06 -07:00
Moe 117918a4ac update internal setting suggestion in monedit.ejs 2018-07-17 19:24:14 -07:00
Moe f2fcf8e034 Allow deleting files from filesystem when deleting monitor 2018-07-15 21:57:06 -07:00
Moe b8c8f4bb3f more coProcessor logs and cleanup 2018-07-15 14:10:22 -07:00
Moe 05b6573e1e status changing lang vars for notifications 2018-07-15 12:25:15 -07:00
Moe f52a725c0e critical bug fixes : coProcessor spawns, log filter
- Fix non-gracefully closing coProcessors
- add error handler on Mp4Frag
- speedup ffmpeg log filter
2018-07-12 22:57:48 -07:00
Moe 950fc7c8c1 Option to attach video on event (Discord and Email) 2018-07-12 11:27:15 -07:00
Moe 70500dca7a Allow JPEG API (and other JPEG based outputs) with CUDA with coProcessor
- a second FFmpeg process is launched to create the JPEG and PAM data.
- currently stream channels are not offloaded
2018-07-11 23:47:43 -07:00
Moe cb83daeab8 Discord bot as account option instead of system configuration
- each "admin" account can login their own discord bot for notifications
2018-07-09 11:29:20 -07:00
Moe 939c0d4e5e Event on Trigger gets Discord notifications and video clip attachments
- Traditional Recording must be enabled to get a video clip and JPEG API must be enabled to get a JPEG snapshot (for now)
- Email also gets the attachments
2018-07-08 23:32:52 -07:00
Moe caddbfc4f5 Monitor stream audio toggle (video element) added to menu 2018-07-07 19:56:18 -07:00
Moe bd7d84306d Option to Restrict Sub-Account viewing logs 2018-07-07 16:06:16 -07:00
Moe 1fad2f319f Option to Restrict Sub-Account changing their user settings 2018-07-07 16:00:23 -07:00
Moe 4f5da4ad7a allow multiple zip and download of videos
- and cleanup in main.dash2.js
2018-07-07 10:41:09 -07:00
Moe 5a04813557 add Log Stream in Monitor Settings window
- Logging Section moved to bottom because it grows in size when logs are streaming.
2018-07-02 21:21:10 -07:00
Moe a850ad638d show real monitor status instead of just mode 2018-06-28 18:36:56 -07:00
Moe c940294f00 Shinobi Pro Lands on Gitlab 2018-06-09 16:34:06 -07:00