Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
Isaac Connor
|
4defad1352
|
Merge branch 'add_scale_to_frame_view' into storageareas
|
2016-10-26 14:04:43 -04:00 |
|
Isaac Connor
|
c74cc54ac0
|
add a scale element to the frame view. Include some bits from StorageAreas to make it work
|
2016-10-26 13:34:30 -04:00 |
|
Isaac Connor
|
cf9fa78ca3
|
work on fixing event view
|
2016-09-29 09:28:48 -04:00 |
|
Isaac Connor
|
19d46c2d09
|
Merge branch 'master' into storageareas
|
2016-08-15 10:45:50 -04:00 |
|
Isaac Connor
|
a0bc30d3fe
|
fix the order of analyse/capture being passed
|
2016-08-12 15:40:47 -04:00 |
|
Isaac Connor
|
9106675842
|
pass capture or analyse to getImageSrc
|
2016-08-12 15:17:13 -04:00 |
|
Isaac Connor
|
bc4923b555
|
use instead of for the frame object and pass to getImageSrc which expects an array
|
2016-08-12 13:50:18 -04:00 |
|
Isaac Connor
|
6ab2b33e95
|
fix merge
|
2016-06-27 09:10:35 -04:00 |
|
Isaac Connor
|
e29a0ebe71
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-06-21 13:48:32 -04:00 |
|
Isaac Connor
|
6a8db582ff
|
whitespacing updates
|
2016-06-21 12:21:18 -04:00 |
|
Isaac Connor
|
26bba58c56
|
Merge branch 'master' into feature-h264-videostorage
|
2016-06-17 11:09:47 -04:00 |
|
Isaac Connor
|
9601b30972
|
Add Width, Height and alt to frame
|
2016-05-16 13:26:44 -04:00 |
|
Isaac Connor
|
e4566f2e8e
|
Merge branch 'update_image_view' into storageareas
|
2016-05-16 12:23:19 -04:00 |
Isaac Connor
|
df8964c1f9
|
use eid= & fid= instead of path to frame image. The use of view=image also provides more security.
|
2016-05-16 10:33:21 -04:00 |
Isaac Connor
|
27b928839c
|
deprecate view=image-ffmpeg
|
2016-05-05 15:04:11 -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 |
Michael
|
5c44285f98
|
dynamically create jpegs from video file for viewing in browser
|
2015-07-29 00:24:05 +10:00 |
Andrew Bauer
|
3a94712db2
|
add translate function
|
2015-05-10 08:10:30 -05:00 |
SteveGilvarry
|
e87e69fa57
|
Ran script to replace all Short open tags
|
2014-12-05 10:44:23 +11:00 |
|
Isaac Connor
|
967dda737c
|
more copying mysql2PDO from classic. Also, some fixes in classic
|
2014-03-21 17:16:56 -04:00 |
|
Isaac Connor
|
3393a63525
|
more updates
|
2013-12-17 12:53:15 -05:00 |
|
Isaac Connor
|
2a45506bff
|
more quoting removal
|
2013-10-17 16:15:04 -04:00 |
stan
|
2c47a15f9b
|
Use event dimensions instead of monitor ones as they may have changed.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3520 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-11-10 22:53:29 +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
|
1fad2d7ec9
|
Changed query separator to & and miscellaneous html fixes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2982 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-10-16 17:09:16 +00:00 |
|
stan
|
ef8f7b85fd
|
Continuing development and bugfixes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-09-26 09:47:20 +00:00 |
|
stan
|
106882c161
|
Updated copyright notices
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-07-25 09:48:16 +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 |