Commit Graph

2104 Commits (85c965eef87bca16cc96316ec9dba16c2337d767)

Author SHA1 Message Date
Moe ab7aad773a Update en_CA.js 2021-05-04 15:50:10 -07:00
Moe c041d0fad8 Timelapse, Event Filters, ONVIF Scanner, Camera Probe added to definitions 2021-05-04 13:17:43 -07:00
Moe 5d672c240b monitorId update in onDetectorJpegOutputSecondary 2021-05-03 18:50:30 -07:00
Moe 4f2fd9a044 Update dash2.confirm.js 2021-05-03 18:49:25 -07:00
Moe 3e81485d43 Fix SFTP Upload and Update package.json 2021-05-03 18:49:17 -07:00
Moe 496504282b Force P2P connection to reinit every 15 minutes 2021-04-29 17:59:05 -07:00
Moe 4bb8738a87 fix Object Detection > Check for Motion first 2021-04-29 17:58:28 -07:00
Moe 14bb429c54 load DiscordBot UI fields dynamically 2021-04-29 17:54:11 -07:00
Moe ec647db625 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2021-04-28 10:16:13 -07:00
Moe e6846bcea6 Merge branch 'core-changes-for-dashboard-v3' into 'dev'
Core changes for Dashboard v3

See merge request Shinobi-Systems/Shinobi!303
2021-04-28 17:09:44 +00:00
Moe da832659a9 make old dashboard accommodate new definitions file 2021-04-28 06:44:35 -07:00
Moe 9f4b1934b9 update discord fields to be created dynamically 2021-04-27 11:37:19 -07:00
Moe ff60df27d4 ffmpeg.js : change crf to q:v 2021-04-27 08:28:59 -07:00
Moe b8f66b2786 Add Telegram Notifications+ 2021-04-26 23:11:43 -07:00
Moe 87650716cc Add Telegram Notifications 2021-04-26 23:02:26 -07:00
Moe baa277f359 Create opencvMotionTest.js 2021-04-26 18:25:10 -07:00
Moe da83fa6cbd Create apiEndpoints.js 2021-04-26 18:24:11 -07:00
Moe 9e3e1c3d1e Create convertDefinitionsFieldInfosToLangParam.js 2021-04-26 18:23:56 -07:00
Moe 9e53f0c735 update definitions and language files 2021-04-26 18:23:08 -07:00
Moe 994dd9f04a Merge branch 'ecarjat-master-patch-67499' into 'dev'
charset and collate are only allowed for mysql

See merge request Shinobi-Systems/Shinobi!302
2021-04-25 15:32:23 +00:00
ecarjat c1e5c5f006 charset and collate are only allowed for mysql 2021-04-25 13:39:59 +00:00
Moe 381e7181b1 Fix overflowed daterangepicker (saturday bug) 2021-04-24 11:52:13 -07:00
Moe 73de7845fc Merge branch 'dev' into 'master'
Diligent Dingo+

See merge request Shinobi-Systems/Shinobi!301
2021-04-23 16:54:09 +00:00
Moe 56dce0d0bd Update en_CA.json 2021-04-22 09:45:29 -07:00
Moe ba9bdb665d Add Schedules to definitions 2021-04-22 09:45:20 -07:00
Moe 92d14c1072 FIx ER_TOO_LONG_KEY: LoginTokens table 2021-04-22 09:42:26 -07:00
Moe 3d4a6d7867 Add Ice-v3 for bs5 dashboard 2021-04-20 23:29:38 -07:00
Moe 99238a9061 Update en_CA.json 2021-04-20 23:29:16 -07:00
Moe e3954260c4 update layout of Sub-Accounts, Add Region Editor to definitions 2021-04-20 23:29:13 -07:00
Moe 7bd51122b5 fix basic Control request missing query string 2021-04-17 10:27:44 -07:00
Moe c298ee2549 Merge branch 'dev' into 'master'
Diligent Dingo

See merge request Shinobi-Systems/Shinobi!300
2021-04-17 17:13:17 +00:00
Moe cdae16c497 Force Tensorflow installer to get specific version 2021-04-17 10:11:05 -07:00
Moe 9238679119 Fix Sub-Account being created as Admin account 2021-04-17 10:04:27 -07:00
Moe 25c4b9d085 minor cleanup 2021-04-17 10:04:08 -07:00
Moe 4f985bd52e Add second Vancouver P2P server 2021-04-13 20:49:26 -07:00
Moe 7d93ebb566 Update INSTALL-jetson.sh 2021-04-12 20:46:13 -07:00
Moe 8c1cedee91 clean up stream object css slightly 2021-04-09 15:12:47 -07:00
Moe 6987ca20f4 make motion detection show pam-diff bounding boxes 2021-04-09 14:18:56 -07:00
Moe a47b40444e Object Detect for 5 seconds instead of 1 frame when check Motion first 2021-04-09 14:10:31 -07:00
Moe 04ec802951 fix detector fps when using motion first for object detect 2021-04-09 12:08:37 -07:00
Moe 4db5d3a4e5 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2021-04-08 08:28:52 -07:00
Moe 3e61b6b3e8 Add Ukrainian Language by tweekend.ua 2021-04-08 08:28:45 -07:00
Moe 56d15a179a Merge branch 'ldap-auth-update' into 'dev'
Update LDAP to use Alternate Login System

See merge request Shinobi-Systems/Shinobi!298
2021-04-08 03:49:47 +00:00
Moe 774ccdc773 Merge branch 'mjevange-dev-patch-00697' into 'dev'
Repair cert file copy: SSL_CONFIG points to ./ssl, not ./ssl/ssl

See merge request Shinobi-Systems/Shinobi!299
2021-04-08 02:24:27 +00:00
Matt Evangelisti a127df5f5a Repair cert file copy: SSL_CONFIG points to ./ssl, not ./ssl/ssl 2021-04-08 02:12:39 +00:00
Moe 226c41c727 Fix backblaze init when disabled 2021-04-07 19:06:06 -07:00
Moe 1d6ae4e5d9 update Settings Window Builder, cleanup LDAP presentation 2021-04-07 19:03:24 -07:00
Moe 887586cf4e update package.json and package-lock.json 2021-04-07 16:31:28 -07:00
Moe 6847316f01 Create ldapTest.js 2021-04-06 20:55:42 -07:00
Moe 268ce83784 update ldap account linking to use Alternate Login system 2021-04-06 20:55:16 -07:00