ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,102 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

359 Commits

Author SHA1 Message Date
Andrew Bauer 42e021e652 Merge pull request #976 from SteveGilvarry/FrameImageGen 
Dynamically create jpegs from video file for viewing in browser
 2015-07-28 10:10:38 -05:00
Michael 5c44285f98 dynamically create jpegs from video file for viewing in browser 2015-07-29 00:24:05 +10:00
Michael 7502e5b3e3 added control for video playback rate 
Conflicts:
	web/skins/classic/views/event.php
 2015-07-29 00:07:19 +10:00
Michael 477c34cc2c Added missing brackets 2015-07-28 23:08:45 +10:00
Michael 6c8dbb8bea Typo 
added missing "
 2015-07-28 23:08:10 +10:00
Michael 2d4c2bbe0a Beautify! 
Make the code somewhat readable.
 2015-07-28 23:05:06 +10:00
user 46204c2768 local storage of video js plugin 2015-07-28 23:03:59 +10:00
user 2e8d88915b removed redundant field in sql query 
Conflicts:
	web/skins/classic/views/event.php
 2015-07-28 23:02:56 +10:00
user 05e82d2a96 proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate 
Conflicts:
	web/skins/classic/views/event.php
 2015-07-28 22:55:27 +10:00
SteveGilvarry f09a551d6a Merge branch 'master' into feature-h264-videostorage 2015-07-28 21:06:52 +10:00
Isaac Connor 02ee745167 parameter to defined should be in quotes 2015-07-17 10:09:22 -04:00
root 560a4cccbe Show correct part of URL (hostname) for ffmpeg sources in console 2015-07-17 13:59:40 +02:00
Isaac Connor ace8597b8d Merge branch 'master' into multi-server 2015-07-14 16:10:51 -04:00
Isaac Connor 04366e752a add Servers to options, a server editing popup and a server selection to monitors 2015-07-09 11:41:46 -04:00
Pliable Pixels 1a0d4d2221 Console now shows custom run state in header (if applicable) 2015-06-21 09:31:21 -04:00
SteveGilvarry b6af731400 Add translate options for h264 Storage options in Monitor and update en_gb file 2015-06-10 23:41:17 +10:00
SteveGilvarry 9b06b1399c Merge branch 'master' into feature-h264-videostorage 
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
	src/zm_ffmpeg_camera.cpp
	web/skins/classic/views/event.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/timeline.php
 2015-06-10 23:09:30 +10:00
Isaac Connor f99c5f3627 use correct tag for the frame popup so that it gets the correct popup window size 2015-06-03 12:09:38 -04:00
Andrew Bauer bf4038a724 followup changes based on comments in #833 2015-05-21 12:23:31 -05:00
Andrew Bauer 3a94712db2 add translate function 2015-05-10 08:10:30 -05:00
Andrew Bauer 8a1625463c Merge pull request #823 from ZoneMinder/fix_session_concurrency 
close the session before requiring the page contents to fix the concurre...
 2015-05-09 17:50:18 -05:00
Isaac Connor 01af58018b close the session before requiring the page contents to fix the concurrency issue that exists due to using the file-backed session. 2015-04-20 13:06:34 -04:00
Emmanuel Papin 81eaf44595 Fix a bad SLANG key in monitor.php 2015-04-18 19:37:56 +02:00
Emmanuel Papin 216348274b Remove a remaining hardcoded string 2015-04-18 18:14:36 +02:00
Emmanuel Papin ac8ace33f8 Remove hardcoded localized strings and update lang files 2015-04-18 17:14:14 +02:00
SteveGilvarry 98d91ded90 Found some introduced short tags 2015-04-08 20:13:27 +10:00
SteveGilvarry 45fd7f1eca Found some old open tags left over 2015-04-08 20:11:26 +10:00
SteveGilvarry fd94d22b0e Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors 2015-03-22 17:31:22 +11:00
SteveGilvarry b3313edde0 Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch 
Conflicts:
	web/skins/classic/views/event.php
 2015-03-21 23:49:56 +11:00
Isaac Connor 362153cb3a Also fix video.pho which has the same problem. 2015-02-23 14:34:13 -05:00
Isaac Connor bff26154b0 Also fix video.pho which has the same problem. 2015-02-23 14:31:15 -05:00
Isaac Connor c9f109bc27 also fix timeline which has the same problem 2015-02-23 14:27:35 -05:00
Isaac Connor dd714665bd use explode instead of preg_split 2015-02-23 14:18:10 -05:00
Isaac Connor bd3a9806b8 Fix sql query when user is limited to specific monitors 2015-02-23 14:16:04 -05:00
Isaac Connor 851a246cf2 Revert "Fix sql query when user is limited to specific monitors" 
This reverts commit 41b581552e.
 2015-02-23 14:10:53 -05:00
Isaac Connor 41b581552e Fix sql query when user is limited to specific monitors 2015-02-23 14:10:18 -05:00
Isaac Connor 9b0c8085eb Merge pull request #720 from knnniggett/zmonvif 
Don't show ONVIf probe link when ONVIF support is not enabled
 2015-02-21 15:50:07 -05:00
Andrew Bauer 7ef503ff59 User configurable arp tool 2015-02-21 13:08:04 -06:00
Andrew Bauer b000b997e9 Merge pull request #709 from ZoneMinder/find_arp 
try harder to find arp.
 2015-02-21 11:53:26 -06:00
Andrew Bauer 4182fb3295 Don't show ONVIf probe link when ONVIF support is not enabled 2015-02-21 11:12:07 -06:00
Isaac Connor 438456ce93 include output if can't find arp 2015-02-19 15:43:34 -05:00
Andy Bauer 9f3ff787d1 Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_create.sql.in
	distros/redhat/archive/zoneminder.el6.spec
	distros/redhat/zoneminder.el6.spec
	web/skins/classic/views/monitor.php
 2015-02-18 18:53:47 -06:00
Isaac Connor 13c6be548d If type -p doesn't work, try which, and if that doesn't work just try /usr/sbin/arp. Also don't bother with escapeshellcmd because these are not user inputs. 2015-02-17 15:39:59 -05:00
SteveGilvarry 79c82ea880 Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch 2015-02-17 23:16:42 +11:00
SteveGilvarry ada53bbb28 Testing videojs for video playback 2015-02-16 19:43:13 +11:00
Isaac Connor 2b00ebd02c if path results in an empty string, set it to something so that the link is there when type is vlc 2015-02-03 10:52:49 -05:00
Isaac Connor bf688f2d39 trival quoting changes and missing semi colons 2015-02-02 19:06:45 -05:00
Isaac Connor 690a2f083e fix montage layout broken by my skin merging 2015-02-02 19:06:20 -05:00
SteveGilvarry 9fe5b08726 Fix bracket issues post merge 2015-01-06 15:12:09 +10:00
Steve Gilvarry a44f83cb7d #658 Fix error message for finding arp path 2015-01-05 07:58:39 +11:00