4465649c4c
cleanup cron.js and fix broken knexQuery
2020-10-18 21:41:27 -07:00
702be4c927
fix hanging process with motion enabled (coProcessor junk removed)
2020-10-18 18:53:20 -07:00
20f963ef06
return ffmpeg string parse code to old method
2020-10-18 17:29:06 -07:00
22c4867eea
bug cleanup
2020-10-18 17:18:46 -07:00
7eeeebec10
remove coSpawnClose
2020-10-18 14:13:57 -07:00
6353c2c3bb
Update ffmpeg.js
2020-10-18 10:28:36 -07:00
1d3aba59d6
add separate mapping available to Object Detector, default is global's
2020-10-17 20:35:35 -07:00
cbe0af5273
make google drive "Get Code" button launch setup tutorial if minimum not set
2020-10-17 18:40:25 -07:00
ea9e97e437
remove coprocessor code
2020-10-17 18:39:54 -07:00
bab046a741
minor cleaning
2020-10-17 15:11:23 -07:00
82c03feec4
ffmpeg.js : rewrite detector frame output
2020-10-17 14:34:10 -07:00
75be669bc2
add pureStream for video file API method
2020-10-15 15:07:26 -07:00
ba40d5bdb1
fix fileBin purging function
2020-10-09 22:50:49 -07:00
368c23af25
Allow P2P server to pass real IP of user connected to dashboard
2020-10-09 22:50:08 -07:00
560cf2c7ec
add row caching and add delete button for timelapse frames
2020-10-09 22:49:11 -07:00
76b9d7f105
fix Tmelapse Frame purge
2020-10-09 17:11:54 -07:00
dea7738713
Fix backward timelapse video
2020-10-09 12:47:08 -07:00
aae352c998
humanize timelapse mp4 builder
2020-10-09 12:34:15 -07:00
862bcb4d1d
Show more live stats in P2P Server selection
2020-10-08 17:01:23 -07:00
d462978454
modify PTZ center button to move camera to Home position for ONVIF
2020-10-08 16:57:20 -07:00
a50d7041dc
http icon flag handler from query string
2020-10-07 14:26:30 -07:00
c43377d196
humanize Easy Remote Access tab more
2020-10-07 14:25:28 -07:00
ce5107550a
p2p : kill client connections when server disconnects
2020-10-03 15:48:25 -07:00
6dc438fdd7
humanize P2P UI more
2020-10-03 11:54:48 -07:00
e45c411490
Add Production P2P Servers to list in Super User Panel
2020-10-02 21:27:29 -07:00
4e481b37b8
fix p2p memory leak with streaming http methods
2020-09-30 21:50:07 -07:00
14b15be4c0
begin proper secton for Notification toggles
...
- Future versions may have breaking changes involving notifications. Currently each type of notification has a toggle for each method. It will be mad so that a Method is the toggle for all types of Notifications and each type of Notifications will have a single toggle. This will be to mitigate the speed of the ever-growing numer of options.
2020-09-30 19:39:14 -07:00
f8e5235b1f
add email and discord notification for when monitor dies
2020-09-30 12:17:25 -07:00
91c29ea531
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2020-09-29 11:39:59 -07:00
b5d762c9b3
provide proper response data in 3rd argument of insertCompletedVideoExtensions
2020-09-29 11:39:56 -07:00
d355cd23b9
uploaders/s3based: GCP does not support multipart
2020-09-29 17:15:37 +00:00
04671cdec0
Update worker.js
2020-09-28 15:07:14 -07:00
e2feb19b39
Update worker.js
2020-09-28 09:31:49 -07:00
c35f286fad
cleaner connection to p2p
2020-09-27 22:14:36 -07:00
6e2ab4d61f
Add UI for Easy Remote Access (P2P) in Superuser panel
2020-09-26 22:52:52 -07:00
b1d8672566
put p2p functions in worker process
2020-09-23 21:21:03 -07:00
bec8039b79
Merge branch 'p2p-framework' into 'dev'
...
P2P Service Connector (Optional)
See merge request Shinobi-Systems/Shinobi!239
2020-09-22 17:27:30 +00:00
70d22322e1
P2P : Machine ID is now forced as P2P API Key and Group Key
2020-09-22 10:21:08 -07:00
7ce737395c
fix video limit+
2020-09-22 08:58:58 -07:00
830a2291f3
fix video limit
2020-09-22 08:54:57 -07:00
b04749852b
Merge branch 'dev' into 'p2p-framework'
...
# Conflicts:
# libs/monitor.js
2020-09-22 15:45:34 +00:00
fe928efcab
minor cleanup to usage
2020-09-21 23:49:18 -07:00
5dd153f288
clean p2p logging
2020-09-20 23:11:07 -07:00
edbcbcdd29
update PTZ button appearance
2020-09-20 21:26:01 -07:00
a2e8de4386
auto ptz : cleanup return home
2020-09-20 10:45:10 -07:00
e5646e5fb1
Update ptz.js
2020-09-19 23:31:55 -07:00
ad007b6f8f
Improve Automatic PTZ (Return Home when Object lost)
...
+ Add Inverting Y-Axis
+ Add ONVIF Scanning Port 8899
+ Cleanup some ptz.js function uses
2020-09-19 23:28:35 -07:00
9a10777d3f
make detector frame sender check connectivity on each frame
...
- this will avoid needing to start a monitor after a plugin is added
2020-09-16 21:04:30 -07:00
27fff92c7f
fix schedules repeat
2020-09-16 13:04:56 -07:00
55329bb4ae
minor cleanup
2020-09-13 23:53:51 -07:00
91fadc44df
P2P : Can create connection based on config
2020-09-13 23:49:52 -07:00
9f157abe8c
minor cleanup
2020-09-06 12:16:25 -07:00
22c9b334b6
Cache video row when viewing to prevent database hammer on chunking
2020-09-06 12:11:36 -07:00
d1e68ffe37
Revert ftp daemon back to ftp-srv
...
- The telnet vulnerability was fixed, no longer any need to attempt migration
2020-09-06 11:55:42 -07:00
e791a9895e
fix deleting monitorStates
2020-09-06 09:41:51 -07:00
49be90333f
Disallow email spamming from improper account creations
2020-09-05 09:46:31 -07:00
7c1a1a0c08
re-engage previous mp4 file serving
2020-09-02 14:38:13 -07:00
2acec03cc7
Merge branch 'minor-bugs' into 'dev'
...
Minor Bug: Entering to an undefined variable on libs/webServerPaths.js
See merge request Shinobi-Systems/Shinobi!230
2020-08-28 20:02:56 +00:00
4e9c6b9dd3
minor bug solved
2020-08-28 15:35:45 -04:00
41cd51ccd6
update ram collection
2020-08-28 09:30:25 -07:00
cf6799eff2
add damaged audio warning
2020-08-27 21:58:42 -07:00
3cfa84e317
update ram collection
2020-08-27 19:45:49 -07:00
815fbb0cae
remove extraneous option
2020-08-27 16:20:33 -07:00
4af8b7ff8c
update CPU use collection for Child Nodes
2020-08-27 15:49:16 -07:00
a3df638988
Update CPU and RAM collection and display methods
2020-08-27 15:40:30 -07:00
2886e58918
Child Node cameraDestroy fix
2020-08-27 15:39:39 -07:00
d916b8d5cd
Minor cleanup++
2020-08-26 22:40:57 -07:00
6398578897
Minor cleanup+
2020-08-26 22:37:44 -07:00
cc4adfa5bc
Minor cleanup in libs/monitor.js+
2020-08-26 22:30:18 -07:00
1bb95ef664
Minor cleanup
2020-08-26 22:18:42 -07:00
a446c0aa59
Minor cleanup in libs/monitor.js
2020-08-26 21:36:36 -07:00
3e8d605de8
Merge branch 'poseidon-mp4-command-issue' into 'dev'
...
Poseidon Socket-IO "Race Condition" Issue
See merge request Shinobi-Systems/Shinobi!229
2020-08-27 00:46:10 +00:00
f0321004ac
Update Docker image to use Ubuntu 20.04
2020-08-26 15:30:34 -07:00
7e44316c39
issue solved
2020-08-26 14:41:20 -04:00
37ad70ba6c
update /config/conf.json when conf.json saved from Superuser panel
2020-08-26 10:34:10 -07:00
21eee0f477
save super.json in /config on update - Docker only
2020-08-26 10:26:58 -07:00
31eaa2efbc
timelapse and minor error fixes
2020-08-25 21:55:01 +00:00
7387866aee
Merge branch 'dev' into 'dev'
...
Remote ONVIF Control
See merge request Shinobi-Systems/Shinobi!226
2020-08-19 18:47:05 +00:00
8a6bfecf05
add cuda and opencl hwaccel options
2020-08-19 11:46:29 -07:00
dedaa79a68
Remote ONVIF Control
2020-08-19 01:11:11 -04:00
b193827192
fix row deletion
2020-08-18 08:42:43 -07:00
b06a3ee1a9
speed up monitor snapshot retrieval on login
2020-08-17 11:26:05 -07:00
3f13478d60
temporary fix for 2 factor auth login
2020-08-17 11:25:42 -07:00
20633e2da4
cleaner snapshot creation
2020-08-16 15:41:05 -07:00
c4a56f276c
Update monitor.js
2020-08-15 22:08:12 -07:00
b14ef3cda6
fix caching for snapshot icon
2020-08-15 22:06:22 -07:00
9b00ec8d93
Icon HTTP API Endpoint
2020-08-15 20:36:32 -07:00
0462aae539
lightly update FileBin methods, prepare for shinobi-video-synopsis
2020-08-14 23:05:01 -07:00
b7cd712ba7
update debugLog
2020-08-14 19:22:33 -07:00
0d92d354c7
keep primary Temp directory path in memory
2020-08-14 19:21:55 -07:00
b71dc60f20
validation for failed FTP login attempt
2020-08-14 12:30:17 -07:00
cb279ef400
By default enable Use Camera Timestamps
2020-08-14 10:28:40 -07:00
cb5a170aa2
fix Child Node video push
2020-08-12 20:04:08 -07:00
0ea7857e45
Update notification.js
2020-08-12 18:21:38 -07:00
aa1e552325
Update notification.js
2020-08-12 17:49:19 -07:00
09a92e7d17
make custom events run syncronously inside async function
2020-08-12 17:37:24 -07:00
f2828dd0cc
make s.getRawSnapshotFromMonitor a Promise function
2020-08-12 17:37:04 -07:00
a6fdc9cf51
Replace FTP Server (ftp-srv) with ftpd (shinobi-ftpd)
2020-08-12 16:35:30 -07:00
495b5cf0b8
disable ranges in mp4 file streamed over http
2020-08-12 10:37:59 -07:00
7e18b8e1f3
minor update on ptz logging
2020-08-11 13:29:15 -07:00
4ed8063c6a
Merge branch 'issue-200' into 'dev'
...
Issue 200 solved
See merge request Shinobi-Systems/Shinobi!222
2020-08-11 19:36:15 +00:00
872bc207bc
bug and its related dependencies, solved
2020-08-11 15:00:33 -04:00
6054f50baa
add smtpServerOptions conf.json parameter
...
Options available are https://nodemailer.com/extras/smtp-server/
2020-08-11 09:16:53 -07:00
70eedf740e
customAutoLoad UI : minor prettify++
2020-08-10 21:40:22 -07:00
8bf7909191
customAutoLoad UI : Display Install Information
2020-08-10 21:10:05 -07:00
d0425d7712
customAutoLoad : validation updates
2020-08-10 20:31:28 -07:00
650122c384
Prepare FileBin management : add proper FileBin database controller func +
2020-08-10 20:31:02 -07:00
4696f1131d
Prepare FileBin management : add proper FileBin database controller functions
2020-08-10 20:30:50 -07:00
2acb60f880
customAutoLoad management fixes+
2020-08-10 16:10:49 -07:00
36d7c71a54
customAutoLoad management fixes
2020-08-10 15:58:56 -07:00
e119bd10d6
customAutoLoad Module UI : Download Method
2020-08-09 23:22:35 -07:00
7f997649df
customAutoLoad Module UI : Enable, Disable, Delete, Install functions
2020-08-09 23:13:18 -07:00
c95f34d7da
Fix permissions to view monitors for sub accounts+
2020-08-09 19:21:26 -07:00
7948ef9089
Fix permissions to view monitors for sub accounts
2020-08-09 19:18:32 -07:00
df730d8aa0
add new packages + minor clean
2020-08-09 15:56:27 -07:00
f27111c434
Update webServerPaths.js
2020-08-09 11:13:31 -07:00
9fa36cb34e
API endpoints for managing customAutoLoad modules+
2020-08-08 20:48:37 -07:00
28c8c2a07b
Update customAutoLoad.js
2020-08-08 20:22:26 -07:00
5078abdbfa
API endpoints for managing customAutoLoad modules
2020-08-08 20:20:49 -07:00
bded8b5699
Prepare customAutoLoad install functions for UI++
2020-08-08 12:30:01 -07:00
5e2736c233
minor clean up
2020-08-08 12:23:21 -07:00
f5c2b936fc
Prepare customAutoLoad install functions for UI+
2020-08-08 12:21:38 -07:00
f70cfcfe19
Prepare customAutoLoad install functions for UI
2020-08-08 00:44:00 -07:00
e0c9d4c434
Merge branch 'dev' into 'rebuild-sql-queries'
...
# Conflicts:
# libs/startup.js
# libs/webServerPaths.js
2020-08-08 00:16:24 +00:00
38ce2cdcff
update some more array-based conditons to object
2020-08-07 16:37:27 -07:00
4be1659873
update some delete queries
2020-08-07 15:12:45 -07:00
52a84f4501
pass only groupKey when request Max Storage Amount check
2020-08-07 00:54:56 -07:00
811b6fc846
Modify Max Purge for Video, Timelapse Frames, FileBin, addStorage
2020-08-06 21:33:58 -07:00
80ad30af6c
Uploaded Videos can no longer be streamed in (use streamIn instead)
2020-08-06 11:40:38 -07:00
ede3bd50d3
minor cleanup
2020-08-06 10:44:38 -07:00
cf96da5077
Update socketio.js
2020-08-06 10:05:03 -07:00
878b386782
Update user.js
2020-08-05 20:41:36 -07:00
a311f830a2
sqlQuery Conversion : fix purging on maxStorageAmount
2020-08-05 20:41:01 -07:00
8cc22ffde4
limit user select for loadGroupApps (only need 1)
2020-08-05 18:59:58 -07:00
f29e77846c
sqlQuery Conversion : Fix syntax errors+
2020-08-05 18:16:50 -07:00
c56fbc1d93
sqlQuery Conversion : Fix syntax errors
2020-08-05 18:15:10 -07:00
bcf7c6f665
deprecate automatically selecting single monitor if result is only 1
2020-08-04 19:46:05 -07:00
c0ce19b1eb
deprecate automatically selecting single monitor if result is only 1
2020-08-04 19:45:04 -07:00
17779c0255
postgres needs groupBy on counts
...
- why? some will never know. I sure don't.
2020-07-30 18:42:09 -07:00
3ecbb6da01
Update sql.js
2020-07-30 18:34:53 -07:00
751b59e957
add groupBy
2020-07-30 18:25:57 -07:00
5f88de0690
Update sql.js
2020-07-30 18:17:41 -07:00
4352e043dd
Update sql.js
2020-07-30 18:01:55 -07:00
51a051a0fc
add log for missing where parameter
...
+ fix incorrect "action" label for monitorOrder queries
2020-07-30 17:58:45 -07:00
f32af44122
remove pattern_type glob from timelapse creation
...
- caused newer versions of ffmpeg to crash. flag no longer exists.
2020-07-30 13:56:26 -07:00
c273d2f8c2
fix missing where query+
2020-07-30 13:55:36 -07:00
ebb25eb187
fix missing where query
2020-07-30 13:52:29 -07:00
22f2d37f1f
Show GPS data on Video Recordings (if they have it)
2020-07-29 16:38:04 -07:00
f523ccc2f2
Add Live GPS Display from Dashcam App (NinjaCam)
2020-07-29 11:00:30 -07:00
c42fbb85fd
sqlQuery Conversion : fix permissions for some endpoints
2020-07-27 18:22:12 -07:00
795703cfaf
sqlQuery Conversion : The Last Samurai... err... Function
2020-07-27 18:12:57 -07:00
70524dafbb
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2020-07-27 14:15:42 -07:00
6ace0dfbed
Merge branch 'always_record_on_motion' into 'dev'
...
Optionally allow recording to start on motion prior to object detection results.
See merge request Shinobi-Systems/Shinobi!217
2020-07-27 18:11:50 +00:00
776a7b7f74
allow adding details to externally uploaded video file
2020-07-25 23:15:24 -07:00
7d07124ac5
force image format for image in Email Notifcation (Discord as well)
...
- This should hopefully fix users with broken images in their email notifications.
-- Audio was not being stripped and was being encoded with the frame (JPEG cannot hold audio, duh)
-- image2 format specified
2020-07-25 22:40:35 -07:00
e6b5f42ce4
minor housekeeping
2020-07-22 21:21:34 -07:00
874f774d9a
change to reason instead of "Motion" as title for email screenshot filename
2020-07-22 21:21:09 -07:00
c7c8d620e1
Capture startup video counting errors and post to systemLog
2020-07-22 21:19:51 -07:00
cf91cf85ea
Update Dashcam (Shinobi Streamer) data Input
2020-07-22 21:19:16 -07:00
24a9b2e6e4
Automatic redirect to HTTPS when enabled (fixed)
2020-07-15 09:34:43 -07:00
155b945285
fix reoccurrring const groupKey+
2020-07-14 23:49:31 -07:00
d6bf8e058b
fix reoccurrring const groupKey
2020-07-14 23:43:01 -07:00
2707a13960
Automatic redirect to HTTPS when enabled
2020-07-14 23:38:13 -07:00
a72ea774a8
Optionally allow recording to start on motion prior to object detection results.
2020-07-13 21:50:52 -04:00
7d940cdce5
Fix Error on SFTP Error
2020-07-13 11:39:35 -07:00
0bc88bab74
notifications.js : add template to email notification (prettify)
2020-07-12 15:37:14 -07:00
93ee667f07
webServerPaths : fix some permissions and responses
2020-07-12 14:34:41 -07:00
c2cab29515
knexQuery logic fixes
2020-07-12 14:34:04 -07:00
875bedbc6d
Fix knexQuery error : empty condition
2020-07-11 18:06:07 -07:00
122127f162
Update webServerPaths.js
2020-07-11 16:19:43 -07:00
64a019eac7
Update plugins.js
2020-07-11 14:45:53 -07:00
4b7371e635
sqlQuery Addition : plugins, childeNode
2020-07-11 14:44:37 -07:00
a07ae2add3
existing preQueries now only for MySQL databases
2020-07-11 14:33:45 -07:00
ef336d13d8
sqlQuery Conversion : cleanup timelapse slightly
2020-07-11 14:11:39 -07:00
5a8f3d5afd
add generic SELECT function
2020-07-11 14:10:36 -07:00
b1bb64397a
sqlQuery Conversion : webServerSuperPaths.js
...
+ superApiPrefix fix
+ minor fixes
2020-07-11 14:06:25 -07:00
9b18fb39ba
sqlQuery Conversion : webServerPaths.js
2020-07-11 14:00:14 -07:00
f1fc729435
sqlQuery Conversion : minor cleanup
2020-07-11 13:16:01 -07:00
69f038a477
sqlQuery Conversion : webServerAdminPaths.js
2020-07-11 11:14:30 -07:00
556ea34ba8
sqlQuery Conversion : minor cleanup
2020-07-11 00:39:11 -07:00
70c125db56
sqlQuery Conversion : videos
2020-07-11 00:33:25 -07:00
194593e59c
sqlQuery Conversion : user, videoDropInServer
2020-07-11 00:07:55 -07:00
1abef5ebe7
sqlQuery Conversion : uploaders
2020-07-10 18:58:23 -07:00
aebd01cefd
sqlQuery Conversion : minor update to socketio.js
2020-07-10 17:30:31 -07:00
7f42e3efd0
sqlQuery Conversion : timelapse.js (also refactored backend slightly)
2020-07-10 17:30:08 -07:00
6dfdfe2aa0
sqlQuery Conversion : Add grouped where conditions
2020-07-09 22:48:54 -07:00
21ea4d804f
sqlQuery Conversion : basic, events, notifications, scheduler, socketio
2020-07-09 22:48:34 -07:00
0f73187cb3
sqlQuery Conversion : add limit and orderBy
2020-07-09 07:58:02 -07:00
477d756bef
sqlQuery Conversion : make asCallback inside knexQuery
2020-07-09 07:57:54 -07:00
5db94d1e98
sqlQuery Conversion : auth.js
2020-07-08 23:11:43 -07:00
b99e258f8f
sqlQuery Conversion : monitor.js
2020-07-08 22:52:49 -07:00
e1cc2d3fec
sqlQuery Conversion : rename response to dbQuery
2020-07-08 22:51:45 -07:00
b7db2ecfe9
sqlQuery Conversion : add update, insert, delete to s.knexQuery
...
+ change option tableName to table
2020-07-08 22:38:32 -07:00
b02311386b
sqlQuery Conversion : startup.js
2020-07-08 21:34:12 -07:00
ce7b86d3a1
sqlQuery Conversion : create knexQuery, can only select for now
2020-07-08 21:34:06 -07:00
6b7a17e4ce
Allow detector filters to send emails without a monitor global detector setting of sending email being sent.
2020-07-04 15:31:05 -04:00
f178d2121c
Revert Detector Filter changes (will branch to identify why it drops motion)
2020-07-04 10:04:58 -07:00
fb7972223b
fix not-iterable error in events
2020-07-04 08:56:17 -07:00
05594374d4
Fix ER_DUP_KEYNAME logs
2020-07-03 13:21:04 -07:00
58c5796d4b
Switch logging to user log from system
2020-06-27 14:40:43 -04:00
Moe Alam
Reda B
Sebastián Felipe
Austin Lakeman
Ian Rubado
dennis.cartier