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

941 Commits (d8c8177f9e815b1024e0cc784d6139701ff1d994)

Author SHA1 Message Date
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
Moe cf353ff99d minor cleanup 2019-08-14 10:42:41 -07:00
Moe eac6722736 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2019-08-14 10:41:34 -07:00
Moe 5565127676 add onBeforeInsertCompletedVideo extender 
+ minor cleanup
 2019-08-14 10:41:28 -07:00
Moe 264c317f98 Merge branch 'dev' into 'dev' 
Added CentOS quick install script, updated current CentOS installer

See merge request Shinobi-Systems/Shinobi!98
 2019-08-14 16:56:52 +00:00
Mike Hurley b6c355fa4f Update centos.sh 
- Installs Node.js 10 instead of 8
- Adds MariaDB repo to yum (allows for current versions of MariaDB
- Removed code that will never run
 2019-08-14 14:38:51 +00:00
Mike Hurley 59f6a0dc78 CentOS quick install script 2019-08-14 14:28:59 +00:00
Moe 2736f3a79d Add option to disable SartTLS for SMTP Server 
+ make it so "alarm event" header or subject line is used for SMTP trigger event
 2019-08-13 16:21:39 -07:00
DewGew 594ca5fa24 Update sv_SE.json 2019-08-13 13:31:17 +00:00
DewGew 69e9dd0bb8 Added language vars to folders.js 2019-08-13 08:08:35 +00:00
DewGew 1a06e82024 Update camera.js 2019-08-13 08:07:28 +00:00
DewGew 81d010a27b Added "No Sound" en_CA.json 2019-08-13 08:05:24 +00:00
DewGew 620b036693 Update super.ejs 2019-08-13 07:26:39 +00:00
DewGew 052b9905e4 Update super.ejs 2019-08-13 07:25:35 +00:00
DewGew 23f6965446 Update sv_SE.json 2019-08-13 07:20:28 +00:00
DewGew b86784d8b3 Added Language vars to super.ejs 2019-08-13 07:14:00 +00:00
DewGew 5198b471df Update sv_SE.json 2019-08-13 05:42:17 +00:00
Moe 55b8aafb0f minor cleanup and fixes 2019-08-12 15:23:11 -07:00
Moe bdaff16329 add tab changer, add tabs to power video menu 2019-08-11 20:43:38 -07:00