a1a8f4d09b
remove debug hello
2021-10-19 13:11:50 -04:00
25f6935280
Allow snapshot downloading
2021-09-03 22:26:51 -04:00
814e8559aa
output an error message image when we can't load a jpeg
2021-09-03 22:15:29 -04:00
2273deaf17
Support specifying the export filename by passing the export_root
2021-09-03 22:14:42 -04:00
b10b2932ee
Code spacing and doc
2021-05-03 15:20:11 -04:00
b125b5d370
Allow users with snapshot::view to view the snapshot image of an event
2021-04-12 15:59:31 -04:00
feec631ca5
Only save updated DiskSpace if event is finished
2021-03-15 15:02:43 -04:00
671d58f0d0
bump version and put back ZM_MIN_RTSP_PORT setting
2021-01-26 12:35:17 -05:00
67dac2651b
Log an error with path when can't open video
2020-11-29 17:06:07 -05:00
c8392feba3
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-10-22 16:35:44 -04:00
10c0a6617c
Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php.
2020-10-14 10:39:25 -04:00
3531b8a854
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-09-28 16:14:07 -04:00
a118e52f30
Add 2>&1 to ffmpeg command line to get stderr as well
2020-09-28 16:13:06 -04:00
5771e74a6f
eslint
2020-09-22 15:16:42 -05:00
861ebedcae
Implement a crude view for a failed db connection with a 30 second reload interval.
2020-09-21 11:15:34 -04:00
ae56a1f363
Turn off output buffering in view_video
2020-09-04 14:58:43 -04:00
7d4e1fe895
Test for opening file before getting it's size. Remove some debug in view_video
2020-04-17 09:45:40 -04:00
d99ec696b4
reorganize to reduce code depth
2020-04-10 12:21:53 -04:00
571ff260cc
Merge branch 'release-1.34'
2020-04-04 16:35:09 -04:00
5d72e3b1b5
ensure no output buffering when downloading an archive.
2020-04-03 15:33:28 -04:00
921c4c5bbd
don't return mp4 if objdetect is used
2020-03-14 15:00:33 -04:00
4342506e5b
fix media type allocations
2020-03-14 14:24:39 -04:00
4d5f9f7de0
add back gif, make nomenclature consistent of objdetect_subtypes
2020-03-14 14:18:25 -04:00
9a31d545d4
replace GIF function with MP4
2020-03-14 08:08:52 -04:00
49f23cb35b
Added options to render objdetect, objdetectanim and objdetectimage
2020-03-10 13:51:55 -04:00
38b519c8a6
better error log
2020-03-09 15:58:57 -04:00
6bc8012e04
add support to render gif image that may be created by object detection
2020-03-09 15:56:34 -04:00
c465fa55d8
Use ZM_PATH_FFMPEG instead of ffmpeg
2020-02-06 13:22:22 -05:00
e0d085d187
CHeck for existence of snapshot.jpg or alarm.jpg instead of hitting the database.
2019-10-30 16:57:45 -04:00
12dfcae81f
remove debug
2019-10-21 13:19:20 -04:00
a2861c1361
remove errant (
2019-09-28 14:22:40 -04:00
7cab22b450
Use Event->SaveJPEGs instead of Monitor->SaveJPEGs
2019-08-26 15:04:59 -04:00
79de2b65cd
If we are saving jpegs we don't save a snapshot image, and since we may delay writing frame info to the db, we have to default to frame 0 instead of snapshot
2019-04-04 12:18:46 -04:00
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
5098329d94
remove ob_clean stuff which logs errors when output buffering is turned off ( #2395 )
...
* remove ob_clean stuff which logs errors when output buffering is turned off.
* Don't ob_clean because if buffering is off php will output an error
2019-02-22 09:58:16 -05:00
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
d1b3b23c09
Merge branch 'master' into storageareas
2019-02-13 09:42:03 -05:00
9a0f3801de
fix + instead of .
2019-02-12 16:25:31 -05:00
5ce681b463
instantiate a false Frame object with id = objectect
2019-02-11 16:37:22 -05:00
5a924ab176
cleanup redundant code and spacing
2019-02-11 16:29:19 -05:00
555cb4780d
Merge branch 'master' into storageareas
2019-02-10 12:37:45 -05:00
2dc935b488
added object detection frame rendering ( #2505 )
2019-02-08 13:49:00 -05:00
8eb61b1c11
Merge branch 'master' into storageareas
2019-01-05 10:16:38 -05:00
dea64320f0
Fix a + that should be a .
2019-01-04 15:52:14 -05:00
0bfe1007c8
Merge branch 'master' into storageareas
2018-12-14 10:16:08 -05:00
01a57222d3
keep track if we have written alarmed frame incase savejpeg is off
2018-11-12 12:43:20 -05:00
ca8770bd5a
Merge branch 'fix_rce' into storageareas
2018-10-24 10:17:16 -04:00
9938346752
Merge branch 'master' of github.com:/ZoneMinder/ZoneMinder
2018-10-22 16:14:36 -04:00
f4ddc0fe9b
ob_clcean and flush break outputting the image
2018-10-22 16:13:12 -04:00
7149576a7c
Merge branch 'smarter_packetqueue' into storageareas
2018-10-15 10:59:50 -04:00
Isaac Connor
Andrew Bauer
Pliable Pixels
Isaac Connor
Isaac Connor
Pliable Pixels