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

154 Commits

Author SHA1 Message Date
Isaac Connor 9d76c9cf6a fix fclose 2016-11-03 11:23:50 -04:00
Isaac Connor a87f5e1592 fix sending full content when we should be 2016-11-03 11:23:10 -04:00
Isaac Connor 67e14bd12f move States loading code into state view where it belongs. Move runnign check into specific places where it is needed. These changes reduce events list load time by about 4 seconds for me. 2016-10-20 13:16:50 -04:00
Isaac Connor cb88b984c7 fix capt -> capture and some suspicious sprintf formatting and double quotes to single quotes 2016-10-20 12:01:25 -04:00
Isaac Connor cf9fa78ca3 work on fixing event view 2016-09-29 09:28:48 -04:00
Isaac Connor 3dcc1c3697 fix php outputting extra newlines after content 2016-09-22 10:37:32 -04:00
Isaac Connor 364a80fb94 don't output jpeg header unless there is some kind of success 2016-09-20 15:55:28 -04:00
Isaac Connor ed1b6ccd58 Implement range support 2016-08-31 10:09:01 -04:00
Isaac Connor 19d46c2d09 Merge branch 'master' into storageareas 2016-08-15 10:45:50 -04:00
Isaac Connor bcb7dd1ba4 take optional show= to specify the analyse image or the capture image 2016-08-12 15:16:05 -04:00
Isaac Connor 9f00971e6b Use Debug for debug output instead of Error 2016-06-27 10:27:26 -04:00
Isaac Connor e4566f2e8e Merge branch 'update_image_view' into storageareas 2016-05-16 12:23:19 -04:00
Isaac Connor ed3e975e5a take fid and eid as alternate parameters 2016-05-12 11:55:48 -04:00
Isaac Connor df960bb1ea rework image.php view to properly handle fid being the FrameId instead of fid. Fix scaling. 2016-05-05 14:49:40 -04:00
Isaac Connor 240d08133d implement caching of scaled images. 2016-05-02 14:12:30 -04:00
Isaac Connor b8c8ff3807 fix if structuring 2016-05-02 13:36:19 -04:00
Isaac Connor b50172fc2e introduce a Frame object. Alter the image view to take just an fid, in which case it is the unique primary key Id of the Frame. 2016-04-25 14:59:55 -04:00
Isaac Connor f3673fe4b1 Merge branch 'icon_video' into storageareas 2016-04-11 10:32:07 -04:00
Isaac Connor 67abf91925 add a view to check auth and just send the video 2016-04-11 10:31:51 -04:00
Andy Bauer 4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
Isaac Connor b3c7002eca install view_video as well 2016-04-01 15:44:37 -04:00
Isaac Connor 0d8c63f578 Merge branch 'master' into storageareas 2016-03-02 09:11:55 -05:00
arjunrc 84801fcb86 typo in function name 2016-02-27 13:06:33 -05:00
SteveGilvarry 5ff427d9e9 Removed Autotools Makefile.am 
Conflicts:
	Makefile.am
	misc/Makefile.am
	src/Makefile.am
	web/includes/Makefile.am
	web/js/Makefile.am
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
 2016-02-26 22:19:02 +11:00
Isaac Connor baa805ae60 alternatively, accept and eid and fid to specify the frame 2016-01-14 13:35:30 -05:00
abishai 551194227d compat for php 5.4 2015-11-15 21:40:25 +00:00
Linwood-F c4599cdeda Fix bug report on 100% scale 2 2015-08-09 20:30:42 -04:00
Linwood-F 938a2e7de2 Fix bug report on 100% scale 2015-08-09 20:14:33 -04:00
Linwood-F 4fedb5fce0 Fix typo in last commit 2015-08-09 18:41:12 -04:00
Linwood-F 6da8da9d8d Add ability to do either height or width or both 2015-08-09 18:19:12 -04:00
Linwood-F 34c2902570 Add scale as optional feature to image.php 2015-08-09 12:02:13 -04:00
Isaac Connor ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00
Kyle Johnson c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04:00
Isaac Connor a468baf9eb cleanup 2013-05-10 13:55:45 -04:00
Kyle Johnson 2c04d0774f Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
Kyle Johnson 1ed6462354 Removed all of the old web files 2013-05-01 06:52:43 -04:00
stan 4996dd0a51 Recreated generated files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:46:18 +00:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan 8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 21:59:06 +00:00
stan 46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-07 11:10:18 +00:00
stan dc9e2755b0 Added sample apache config file. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-03 23:27:58 +00:00
stan 70aee2ad56 Regenerated 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3160 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 15:50:41 +00:00
stan 255c311ef1 Updated by autoconf/automake 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3038 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-28 17:39:38 +00:00
stan 9b31bf29e8 Added in image view to allow event root to be able web root 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3031 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-23 09:12:12 +00:00
stan 8cad0dbd6a Updated. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-24 10:27:28 +00:00
stan 11a1cc2d41 Now supports custom perl install path 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-08 09:11:56 +00:00
stan 75c654e654 Downgraded to support autoconf 2.59 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-23 21:59:13 +00:00
stan 3069dc2402 Final timestamp update 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-09 12:45:32 +00:00
stan 429884741a Updated for timestamps 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2801 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-09 12:32:04 +00:00
stan e14efbd493 Updated generated files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2726 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-28 11:24:01 +00:00
stan d43d2289ed Changes from updated build tools. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2714 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-20 14:54:50 +00:00
stan 549aa39cbb Updated autoconf/make files 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2710 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-06 00:05:56 +00:00
stan 7d96edeacd Added .in files to svn 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2681 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-11-03 12:14:50 +00:00
stan 2824cb7355 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-14 13:54:50 +00:00