Commit Graph

638 Commits (0637202c6762df3213a743139c010e52aaf41e02)

Author SHA1 Message Date
Moe 2c9c3876d5 fix typo msg to message in auth.js 2019-07-07 21:05:02 -07:00
Moe df549c8a50 fix typo in getUserByUid 2019-07-07 21:02:08 -07:00
Moe 3007f338c7 fix broken auth 2019-07-07 20:58:33 -07:00
Moe 2c90248ece Update auth.js 2019-07-07 20:57:55 -07:00
Moe 17d11c7931 light cleanup on auth.js refactor 2019-07-07 20:40:02 -07:00
Moe f2918cb09b rename `.mon` and `.mon_conf`
- now labelled `.activeMonitors` and `.rawMonitorConfigurations`
2019-07-07 20:39:41 -07:00
Moe 1cd7e7eaf0 update libs/uploaders + for timelapse frames
- update user.js
+ add "No Region" for s3 based uploader
2019-07-07 20:09:18 -07:00
Moe 77bc8a618c add timelapse frame rules to libs/uploaders/amazonS3.js 2019-07-07 20:07:21 -07:00
Moe ab3aaeb932 Update timelapse.js 2019-07-07 20:06:46 -07:00
Moe 11a87cbb1f add MxPEG support
+ minor cleanup
2019-07-07 20:05:49 -07:00
Moe 10acea1286 add missing rules for startup.js (cloud timelapse count) 2019-07-07 20:02:49 -07:00
Moe 44dc8e865e Update basic.js 2019-07-07 20:01:20 -07:00
Moe 3441618701 auth.js refactor, code cleaner 2019-07-07 20:01:16 -07:00
Moe 92ee6ba684 Create cuda_gl_interop.h.patch 2019-07-07 11:30:26 -07:00
Moe a4b79063e0 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2019-07-07 09:01:17 -07:00
Moe 57b312711d add minimum value 0 for region editor polygon points 2019-07-07 09:00:46 -07:00
Moe b81f136189 Merge branch 'patch-1' into 'dev'
temporary fix scrolling of minitors  in main gui

See merge request Shinobi-Systems/Shinobi!72
2019-07-03 18:53:21 +00:00
Moe 47b48c3f10 Scripts for Jetson Nano
- Install script for OpenCV 3.4 (allows build and install of OpenALPR)
- Uninstaller for Desktop Environment on Ubuntu 18.04 JetPack SD Card Image
2019-07-01 10:56:33 -07:00
Moe 7ca9b39edc Fix hidden setting for Password fields 2019-06-30 09:14:55 -07:00
Moe 043c07deb7 remove undefined "callback" 2019-06-28 23:04:02 -07:00
Alexandr Eryomin d440e252df temporary fix scrolling 2019-06-24 09:02:10 +00:00
Moe 1076b3e0c5 add async and pkg rules 2019-06-23 09:21:17 -07:00
Moe a4b931214a modify libs/rtmpserver/node_core_logger.js 2019-06-21 13:23:25 -07:00
Moe 1051291c87 Add async.queue to s.sqlQuery, fs.readFile and fs.stat+ 2019-06-20 22:43: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 6b7689863a Update jetson-nano-convert-to-headless.sh 2019-06-19 00:24:48 -07:00
Moe 7bc2136e6e Update jetson-nano-convert-to-headless.sh 2019-06-19 00:23:14 -07:00
Moe c9f67e5b66 Add script to make Jetson Nano on Ubuntu 18.04 Desktop into headless server 2019-06-19 00:14:47 -07:00
Moe 2e5071cc26 Merge branch 'patch-2' into 'dev'
Fix "Webhook on trigger" URL Field

See merge request Shinobi-Systems/Shinobi!69
2019-06-14 16:31:30 +00:00
Austin Lakeman ef3067360b Fix "Webhook on trigger" URL Field 2019-06-14 16:25:10 +00:00
Moe f4bcbab297 fix uploaders "Max Storage Amount" fields 2019-06-10 09:22:52 -07:00
Moe 868b5a5eea Update user.js 2019-06-08 16:26:36 -07:00
Moe 9ff60ded36 fix orphan check max setting and add #56 2019-06-07 16:55:25 -07:00
Moe 85cab52b86 Merge branch 'patch-2' into 'dev'
Fix conflicting "name" values for OpenALPR fields.

See merge request Shinobi-Systems/Shinobi!66
2019-06-07 22:47:04 +00:00
Moe d82b32a885 Merge branch 'dev' into 'dev'
Fix ONVIF Camera Zooming

See merge request Shinobi-Systems/Shinobi!59
2019-06-07 22:45:15 +00:00
Moe 66fc2d19ac delete timelapse frame from childNode 2019-06-07 14:30:33 -07:00
Moe 9b8d637401 Change method to getting initial addStorage size 2019-06-07 13:11:09 -07:00
Moe 8e9c130145 Add saving Timelapse Frames from Child Node 2019-06-07 09:52:07 -07:00
Moe 616adf6957 minor tuning for sql.js 2019-06-05 17:32:31 -07:00
Moe 775be6be11 ftp dropInEvent server detects MP4 files and adds them to the database 2019-06-05 16:09:52 -07:00
Moe 6bd998afae allow lowercase "shinobi" in smtp/ftp trigger username 2019-06-05 16:08:34 -07:00
Moe b2b3e574d8 Minor fixes 2019-06-05 16:06:59 -07:00
Moe 88094d07f2 Fix stack exceed error for large videos 2019-06-05 16:06:45 -07:00
Austin Lakeman c4064fed02 Fix conflicting "name" values for OpenALPR fields. 2019-06-05 04:18:30 +00:00
Moe c8f38b0d2f minor cleanup 2019-06-04 09:39:36 -07:00
Moe ce1fe2bc66 fix Command on Event timeout 2019-05-25 12:38:46 -07:00
Moe bfdd54484c Merge branch 'cherry-pick-a33654dc' into 'dev'
Fix "Save Log in SQL": add option values.

See merge request Shinobi-Systems/Shinobi!63
2019-05-24 15:36:48 +00:00
Austin Lakeman 83bfa252ac Fix "Save Log in SQL": add option values.
(cherry picked from commit a33654dcf9)
2019-05-24 15:30:43 +00:00
Moe 72cacda9b0 fix addStorage counter 2019-05-20 17:31:47 -07:00
Moe 478c0937df Add cuda-9 install to face plugin installer
- face plugin requires cuda 9.0.
2019-05-16 10:53:33 -07:00