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

909 Commits (e8e122c6dec0542a5b2c1eafffd4555b2fe2856a)

Author SHA1 Message Date
Moe ac6cd26bcc more async functions 2019-09-07 23:17:57 -07:00
Moe cd18f64792 Update dropInEvents.js 2019-09-07 13:35:03 -07:00
Moe 5524b113e1 make dropInEvent server async functions onMonitorInit 
+ make folder error handler a global function
 2019-09-07 12:49:02 -07:00
Moe edbdcad7b6 clean up some object detector ffmpeg strings 2019-09-06 20:41:24 -07:00
Moe 4e8cdb4876 make camera folder creation sync functions as async 2019-09-06 20:41:09 -07:00
Moe 3fa689ce1d remove $.ajax and use regular XHR in downloadAndZip 2019-09-06 17:28:54 -07:00
Moe 5c80cb4938 fix Content-Type for video file stream 2019-09-06 17:02:17 -07:00
Moe 085b6df7d9 fix Command on Event timeout 2019-09-04 18:20:06 -07:00
Moe 5908830f39 Merge branch 'patch-2' into 'dev' 
Added Language vars to super.ejs

See merge request Shinobi-Systems/Shinobi!96
 2019-08-30 17:07:44 +00:00
Moe c501a8929a Fix Timelapse JPEG generatorUrl, Fix Power Video video launch on drag 
+ minor cleanup of unused files
 2019-08-30 10:00:25 -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 e7632b6a71 Merge branch 'patch-4' into 'dev' 
Added deleted locale for calendar

See merge request Shinobi-Systems/Shinobi!103
 2019-08-28 15:03:10 +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
Moe 1da12d4edf Merge branch 'dev' into 'dev' 
Changed password field type to password, as part of Shinobi-Systems/ShinobiCE#20

See merge request Shinobi-Systems/Shinobi!108
 2019-08-28 14:54:53 +00:00
Mike Hurley 93205068fd Now generates a random cron key during install 2019-08-26 19:54:07 +00:00
Mike Hurley 754b23bc10 Update CentOS - Quick Install.sh 2019-08-26 19:51:54 +00:00
Mike Hurley 775741eb91 Now generates a random cron key during setup 2019-08-26 19:50:50 +00:00
Mike Hurley 1b73aa872a Changed password field type to password, as part of https://gitlab.com/Shinobi-Systems/ShinobiCE/issues/20 2019-08-26 14:26:06 +00:00
Moe 2a1871a016 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2019-08-25 12:24:39 -07:00
Moe 55a64cfb83 CentOS installer updates 2019-08-25 12:21:29 -07:00
Moe cc3c016470 Merge branch 'dev' into 'dev' 
Updated to better work with update Ninja installer

See merge request Shinobi-Systems/Shinobi!105
 2019-08-25 18:39:04 +00:00
Mike Hurley 7152814b4c Added lockout for tasks completed by Ninja installer 2019-08-22 18:33:38 +00:00
Mike Hurley 53b1ca2c9e modified call for CentOS quick installer 2019-08-22 18:32:39 +00:00
DewGew 1f88060f16 Added deleted locale for calendar 2019-08-20 07:44:59 +00:00
DewGew 1dcd5278ff Update en_CA.js 2019-08-20 06:51:45 +00:00
Moe 4477eef813 Merge branch 'dev' into 'master' 
Checkpoint City (#DGR)

See merge request Shinobi-Systems/Shinobi!102
 2019-08-19 16:20:51 +00:00
DewGew 851aff49df Update en_CA.js 2019-08-19 13:46:54 +00:00
DewGew deaa788d04 Update multimon.ejs 2019-08-19 13:30:26 +00:00
DewGew 199bd80c38 Update dash2.multimon.js 2019-08-19 13:29:55 +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 fb4215742b Update super.ejs 2019-08-19 08:34:11 +00:00
DewGew 5b09fff26e Same behavior for headerTitle as in settings.ejs 2019-08-19 08:08:16 +00:00
DewGew 8ed43a9404 Update sv_SE.json 2019-08-19 07:39:05 +00:00
DewGew bdf54fcdae updated without unnesseary headerTitles 2019-08-19 07:38:08 +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 0b39888ecf Merge branch 'dev' into 'dev' 
Additional NPM libraries for CentOS installers

See merge request Shinobi-Systems/Shinobi!99
 2019-08-19 06:56:49 +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
Moe 2acb8bfa57 fix confirm window js 2019-08-18 09:04:57 -07:00
Oleg Vivtash 7cc09bab19 Russian lang file update 2019-08-18 13:53:47 +03:00
Moe 91da5b3404 Push missing Zoom Glass code for Power Viewer 
+ fix "videoAfter" in powerViewer to fix chained playback.
+ return powerViewer autoplay back to on individual video load
 2019-08-17 19:47:59 -07:00
Moe b18b81c4f5 add CentOS quick install to launcher 2019-08-17 10:07:44 -07:00
Moe 0475745aa7 adjust fileQueue timeout on DropInEvents 2019-08-16 13:22:03 -07: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
Mike Hurley 696f597dce - Added additional npm libraries 2019-08-14 18:12:08 +00:00
Mike Hurley 2540090499 - Added mp4frag and cws to npm install 2019-08-14 18:09:51 +00:00