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

232 Commits (4a1789ae89a128988f31eec7732efc19ea4f15fe)

Author SHA1 Message Date
Moe 4a1789ae89 add m3u8 import capability to multimon+ 
- make it compatible with older buffer types
 2019-09-23 15:08:06 -07:00
Moe 8980a65805 add m3u8 import capability to multimon 2019-09-23 12:09:04 -07:00
Moe 0b9a6d03d4 fix timelapse pointer 2019-09-07 23:18:53 -07:00
Moe 3fa689ce1d remove $.ajax and use regular XHR in downloadAndZip 2019-09-06 17:28:54 -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
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
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
DewGew 1f88060f16 Added deleted locale for calendar 2019-08-20 07:44:59 +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 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
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 2acb8bfa57 fix confirm window js 2019-08-18 09:04:57 -07: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 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
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 b86784d8b3 Added Language vars to super.ejs 2019-08-13 07:14:00 +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
Moe dff2629722 Revert "Revert "Revert "Revert "Revert "Revert "force ftp/smtp events to save to sql by default"""""" 
This reverts commit 7ac630a0f7.
 2019-08-11 20:42:42 -07:00
Moe 7ac630a0f7 Revert "Revert "Revert "Revert "Revert "force ftp/smtp events to save to sql by default""""" 
This reverts commit 71184a2cc3.
 2019-08-11 20:42:29 -07:00
Moe 71184a2cc3 Revert "Revert "Revert "Revert "force ftp/smtp events to save to sql by default"""" 
This reverts commit f9b8a2f11a.
 2019-08-11 20:41:22 -07:00
Moe f9b8a2f11a Revert "Revert "Revert "force ftp/smtp events to save to sql by default""" 
This reverts commit 5c1410b283.
 2019-08-11 20:41:09 -07:00
Moe 5c1410b283 Revert "Revert "force ftp/smtp events to save to sql by default"" 
This reverts commit e63b870fbb.
 2019-08-11 20:41:04 -07:00
Moe e63b870fbb Revert "force ftp/smtp events to save to sql by default" 
This reverts commit d2e99eb27c.
 2019-08-11 20:40:37 -07:00
Moe d2e99eb27c force ftp/smtp events to save to sql by default 2019-08-11 20:40:18 -07:00
DewGew 9a58320e66 Added language vars to clock.js 2019-08-09 07:52:48 +00:00
Moe cb4708d1d5 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2019-08-08 17:49:53 -07:00
Moe 9e275b999e add seekbar to powerVideo video item 2019-08-08 15:27:58 -07:00
Moe 00e0fb5df3 Merge branch 'patch-2' into 'dev' 
Added locales to calendar

See merge request Shinobi-Systems/Shinobi!92
 2019-08-07 15:53:19 +00:00
Austin Lakeman 2480814cb1 Fix /super controls 2019-08-07 14:18:36 +00:00
DewGew 838f8c961f Added locales to calendar 2019-08-07 11:28:00 +00:00
DewGew 616426d7d2 Added locales to calendar 2019-08-07 11:26:06 +00:00
Moe 74cdc5d5a0 Power Video Preload videos when current video is at 75% 2019-08-06 18:54:39 -07:00
Moe 791a281f88 make "Zip and Download" a client side interaction 2019-08-05 23:38:36 -07:00
Moe bf5d9c428a Objects show tag instead of "object" in power viewer 2019-08-05 18:11:28 -07:00
Moe 59b00f8f33 fix power viewer seeking 2019-08-05 17:25:43 -07:00
Moe e8742bbdba fix power video viewer launcher in top bar 2019-08-05 16:36:02 -07:00
Moe 7c25e15673 Update dash2.powerVideo2.js 2019-08-05 10:51:51 -07:00
Moe 84229aa972 fix visual appearance for manual "next/previous" press in power video 2019-08-04 09:51:15 -07:00
Moe f2ce3ef7ed fix power video launcher 2019-08-04 09:42:08 -07:00
Moe 07c120d255 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2019-08-04 08:37:08 -07:00
Moe 5a20c67a39 Remove old Timelapse engine 2019-08-04 08:37:06 -07:00
Moe ae01eb53c4 Merge branch 'dev' into 'dev' 
Added swedish language and fix some languages vars in front end

See merge request Shinobi-Systems/Shinobi!83
 2019-08-04 15:35:59 +00:00