ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,132 Commits
89 Branches
6 Tags
96 MiB
Commit Graph

1132 Commits (60af7da99b9931f16e8927b804554ed75dd9f6de)

Author SHA1 Message Date
Moe c943eedddc Merge branch 'dev' into 'master' 
Dashcam App Preparation

See merge request Shinobi-Systems/Shinobi!134
 2019-11-07 18:56:31 +00:00
Moe 759a3702b0 Fix duplicated monitor bug 
+ remove extraneous element
 2019-11-07 10:45:00 -08:00
Moe e6a18ee7c8 set start time for uploaded video based on uploaded file name 2019-11-04 08:47:20 -08:00
Moe 147f3c0051 Add Uploading Video to Monitor Recordings by POST 2019-11-03 07:59:18 -08:00
Moe ed76347b25 Add Webhook and Command to No Motion Detector 2019-10-31 22:02:14 -07:00
Moe a4a652a9f9 fix rerun notrig on event if detector disabled 2019-10-31 21:39:59 -07:00
Moe 115752820d Update No Motion Detector; Add Discord Notification 2019-10-31 17:26:52 -07:00
Moe 662ddedef1 dummy fill missing reason field for event 2019-10-30 14:34:37 -07:00
Moe d6d386cf93 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2019-10-28 13:31:18 -07:00
Moe 5ff2419fac add async methods to webServerPaths 
+ zipVideos with server is being removed. the client side method requires no extra storage space on the server.
 2019-10-28 13:31:10 -07:00
Moe 068f5481e8 fix web stream paths 2019-10-28 13:25:31 -07:00
Moe 797b63581b Merge branch 'update_daterangepicker' into 'dev' 
Update Date Range Picker and Moments

See merge request Shinobi-Systems/Shinobi!130
 2019-10-28 00:35:59 +00:00
Moe 4f893caedb Merge branch 'dev' into 'master' 
fix ffmpeg crashing on record

See merge request Shinobi-Systems/Shinobi!133
 2019-10-27 21:52:25 +00:00
Moe 0c4fdd0811 fix ffmpeg crashing on record 2019-10-27 14:52:04 -07:00
Moe c260127ecc Merge branch 'dev' into 'master' 
Add 1 Week Hider for the Popup window

See merge request Shinobi-Systems/Shinobi!132
 2019-10-27 16:54:29 +00:00
Moe ccc98803b8 Add 1 Week Hider for the Popup window 2019-10-27 08:49:04 -07:00
Moe b9e745fc7c Merge branch 'dev' into 'master' 
Grodd

See merge request Shinobi-Systems/Shinobi!131
 2019-10-26 20:31:48 +00:00
Moe 065ac18d17 Add Subscription Check 2019-10-26 13:29:34 -07:00
Moe d7d0aeb6a8 fix webm recording bug 2019-10-25 10:32:31 -07:00
Mike Hurley 1b348f7ae4 Update daterangepicker.css to version 3.0.5 2019-10-18 17:28:34 +00:00
Mike Hurley cf797adb0c Update daterangepicker.js to version 3.0.5 2019-10-18 17:27:26 +00:00
Mike Hurley ed3062d4b5 Update moment-with-locales.min.js to version 2.24.0 2019-10-18 17:26:02 +00:00
Mike Hurley 620eeb8da2 Update moment.js to version 2.24.0 2019-10-18 17:23:37 +00:00
Moe 73a93ce981 Merge branch 'dev' into 'master' 
Small Flame

See merge request Shinobi-Systems/Shinobi!129
 2019-10-17 19:03:29 +00:00
Moe 697f941220 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2019-10-17 10:15:29 -07:00
Moe 621e58a1c9 fix missing variable for import in multimon 2019-10-17 10:15:27 -07:00
Moe 7495058eaf Merge branch 'CentOS_Installer_(No_SQLite)' into 'dev' 
Cent os installer (no sq lite)

See merge request Shinobi-Systems/Shinobi!128
 2019-10-15 20:13:28 +00:00
Mike Hurley 71b79cd600 Removed option to install using SQLite 2019-10-15 18:39:36 +00:00
Moe abe3cc3a6f remove SQLite installtion option from Ubuntu, OpenSUSE, and CentOS 2019-10-15 14:15:47 -04:00
Moe 2a3f6f39a1 fix API login method for SMTP/FTP 2019-10-09 09:29:49 -07:00
Moe 40481e3d3e fix visibility for Check Signal Interval 2019-10-04 09:53:54 -07:00
Moe d615ad56f1 fix childNode recording transfer 2019-10-04 08:16:57 -07:00
Moe a004ad8439 Merge branch 'dev' into 'master' 
Breath of the Wild++

See merge request Shinobi-Systems/Shinobi!127
 2019-10-04 03:27:14 +00:00
Mike Hurley dd5df9e46c - Added MariaDB password verification 
- Hid MariaDB password input
- Minor fix
 2019-10-03 16:17:32 +00:00
Moe 38287ae784 add missing icon rules 2019-10-03 08:15:07 -07:00
Moe dd53cdb662 replace setTimeout with setInterval in cron.js+ 2019-10-03 08:10:07 -07:00
Moe 71f0d61d85 replace setTimeout with setInterval in cron.js 
+ light cleanup
 2019-10-03 08:04:49 -07:00
Moe cf1fd47745 reset activeMonitor object on failure 
+ fix syntax error with monitor.details
 2019-10-03 08:03:36 -07:00
Moe 1714743935 Merge branch 'dev' into 'master' 
Breath of the Wild+

See merge request Shinobi-Systems/Shinobi!118
 2019-10-03 06:18:48 +00:00
Moe 14353155a2 default autoDropCache to false 2019-10-02 22:52:15 -07:00
Moe 3a81da567c cache side panel icon for faster loading and lower load on client open 2019-10-02 22:04:52 -07:00
Moe 2ad0dbcc4d silence log for fail snapshot 2019-10-02 20:17:29 -07:00
Moe 34e06c4bc6 lightly clean output flag option for snapshot 2019-10-02 19:36:21 -07:00
Moe f594d510b9 Add Snapshot Delay for Discord and Email Notification on Event 2019-10-02 19:25:43 -07:00
Moe 2457ccdfbf Update notification.js 2019-10-02 19:17:20 -07:00
Moe e4ea376f48 fix snapshot : move rtsp_transport flag insertion 2019-10-02 14:45:11 -07:00
Moe 072732bd82 load users before monitors on start 2019-10-02 14:05:56 -07:00
Moe d7eccfacd1 Merge branch 'dev' into 'master' 
Breath of the Wild

See merge request Shinobi-Systems/Shinobi!117
 2019-10-02 19:06:26 +00:00
Moe 52aa04b2d7 fix snap time on detectorStream and HLS 2019-10-02 11:56:20 -07:00
Moe ccf90f67f8 add RTSP Transport to monitorSnapShot command 2019-10-01 13:53:20 -07:00