Commit Graph

24 Commits

Author SHA1 Message Date
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 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 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 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
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
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 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