Isaac Connor
|
842a42bcd5
|
test for existence of mp4 before trying to grab images from it
|
2018-03-28 13:01:58 -07:00 |
Isaac
|
de08e3114e
|
more and less debug
|
2018-01-23 18:16:37 +01:00 |
digital-gnome
|
6d02c88db9
|
Don't round percentage in bulkframes
Gives more accurate frame delta.
|
2017-11-16 12:48:04 -05:00 |
|
digital-gnome
|
5283f778c5
|
Fix virtual/bulk frame calculation
Previously bulk frames wouldn't calculate at the start and end of bulk frame collection. Also the calculation for percent was inaccurate.
|
2017-11-11 14:49:42 -05:00 |
|
digital-gnome
|
8086b6e0a5
|
whitespace
|
2017-11-11 14:49:42 -05:00 |
|
Isaac Connor
|
59e50bbbef
|
Update DiskSpace when we create jpg's
|
2017-10-23 17:04:02 -07:00 |
|
Isaac Connor
|
a836dd5ab3
|
UPdate DiskSpace when creating frame images from the mp4
|
2017-10-23 10:55:24 -07:00 |
Isaac Connor
|
9b809c357b
|
Fix Bulk frame calculations
|
2017-10-17 11:53:34 -07:00 |
|
Isaac Connor
|
e31e106612
|
fix loading virtual frame from bulk frames
|
2017-10-17 10:09:30 -07:00 |
Isaac Connor
|
7ceeef55fc
|
rough in figuring out a frame in between bulk frames
|
2017-10-16 15:16:19 -04:00 |
|
Isaac Connor
|
7f50a13074
|
add Event disk space recalc to zmaudit
|
2017-10-10 12:11:59 -07:00 |
|
Isaac Connor
|
2da374bfb1
|
log the command as well as output and return values
|
2017-05-18 14:43:17 -04:00 |
|
Isaac Connor
|
c125d22d4d
|
Fix Debug to Logger::Debug
|
2017-05-18 12:49:59 -04:00 |
|
Isaac Connor
|
7d6505f015
|
use Delta to grab frame from video, using -ss for speed
|
2017-04-12 16:17:19 -04:00 |
|
Isaac Connor
|
d462dfdb77
|
fix error message when fid not specified
|
2017-04-07 13:20:54 -04:00 |
|
Isaac Connor
|
cee05a1bb7
|
fix merge problem
|
2017-02-02 09:21:49 -05:00 |
|
Isaac Connor
|
7ab6818fa0
|
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
|
2017-01-25 17:14:30 -05:00 |
Andrew Bauer
|
dbd73690b2
|
use !== false rather than === true
|
2017-01-25 09:26:07 -06:00 |
|
Andrew Bauer
|
6189d2670c
|
ZM_DIR_EVENTS can be, and often is, a symlink
|
2017-01-25 09:05:34 -06:00 |
|
Andrew Bauer
|
8b19fca992
|
sanitize the image path before processing
|
2017-01-25 08:30:19 -06:00 |
|
Isaac Connor
|
2ce4bad39b
|
fix Event being undefined when called by path
|
2017-01-13 14:42:10 -05:00 |
|
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
|
6bf921a858
|
Add thumbnanils to the frames view. Also add a content-disposition header and some url mangling to help browsers give a useful filename when doing Save Image As
|
2016-11-21 12:28:15 -05: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
|
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 |