Isaac Connor
|
3109536dda
|
Alternate fix for video generation under csrf. Now we just turn off output buffering (discarding contents before sending the avi
|
2018-06-06 11:55:51 -04:00 |
|
Isaac Connor
|
2aac2e1e05
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-06-06 11:41:36 -04:00 |
|
Isaac Connor
|
b4e0cb5eab
|
WHen we are storing jpgs we don't generate a snapshot, so handle that
|
2018-06-06 11:41:28 -04:00 |
|
Isaac Connor
|
d961b74084
|
spacing and double to single quotes
|
2018-06-06 11:41:00 -04:00 |
|
Isaac Connor
|
db6bd67f59
|
just fix structure/spacing
|
2018-06-06 11:40:38 -04:00 |
|
Isaac Connor
|
798d046d81
|
Remove some debugging lines
|
2018-06-06 11:39:41 -04:00 |
Andrew Bauer
|
c30992be3f
|
fixes #2105
A more simplified approach to fixing #2105, compared to previous attempts.
|
2018-06-06 08:18:33 -05:00 |
|
Isaac Connor
|
5d772f16f6
|
fix closing td
|
2018-06-01 16:18:07 -04:00 |
|
Isaac Connor
|
405b1f92ed
|
add a .fail to log the errors given when a navbar ajax call fails
|
2018-05-31 10:25:53 -04:00 |
|
Isaac Connor
|
af3ce3660f
|
Only unlink if file exists, removing warning. Always return a Storage object in Monitor->Storage() fixes Monitor Delete.
|
2018-05-24 09:54:45 -04:00 |
Isaac Connor
|
be424f46f0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-05-18 12:07:22 -04:00 |
Isaac
|
77b144a13e
|
must specify type=button or else some browsers treat it as a submit button
|
2018-05-18 16:07:58 +02:00 |
|
Isaac
|
337db8bb18
|
Include Content-Length so we get a download progress
|
2018-05-18 15:52:30 +02:00 |
|
Isaac
|
7ad6b01310
|
double to single quotes and spacing
|
2018-05-18 15:52:12 +02:00 |
|
Isaac
|
d8a62e0ede
|
Show total size for non-montage review downloads as well
|
2018-05-18 15:51:42 +02:00 |
|
Isaac
|
cfbbc238c9
|
remove extra spaces and parenthesis
|
2018-05-18 15:51:12 +02:00 |
|
Isaac
|
cc27ce7ee9
|
Turn off csrf for archive downloading, which prevents out of memeory
|
2018-05-18 15:50:45 +02:00 |
|
Isaac Connor
|
2a8ea98249
|
remove blank space at end of line
|
2018-05-18 09:12:10 -04:00 |
|
Isaac Connor
|
4815162bea
|
fix extra }
|
2018-05-18 09:11:15 -04:00 |
|
Isaac Connor
|
8276386a44
|
We always return an associative array now
|
2018-05-18 09:06:17 -04:00 |
|
Isaac Connor
|
25703fb2d4
|
Speed up log query response by generating the options out of the log rows instead of hitting the db again.
|
2018-05-18 09:05:25 -04:00 |
|
Isaac Connor
|
fdaf992156
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-05-16 14:18:48 -04:00 |
|
Isaac
|
93dd943fec
|
Fix some spacing
|
2018-05-16 20:17:57 +02:00 |
|
Isaac Connor
|
780cb693c2
|
google code style
|
2018-05-16 11:14:11 -04:00 |
|
Isaac Connor
|
81c4542a94
|
correct use of getValue. Use standard ddm element value instead
|
2018-05-16 11:13:59 -04:00 |
|
Isaac
|
af63619ce6
|
Fix Messages=>Messaged
|
2018-05-15 21:56:17 +02:00 |
Isaac Connor
|
49d75ce039
|
handle Width and Height not being in ->{} and returnining defaults. Include Path in Source
|
2018-05-15 10:45:47 -07:00 |
|
Isaac Connor
|
f16e1953d9
|
Make Source filter apply to Path as well
|
2018-05-15 10:45:10 -07:00 |
|
Isaac Connor
|
88b66fe5dd
|
Merge ../ZoneMinder.master into storageareas
|
2018-05-14 14:07:51 -04:00 |
|
Isaac Connor
|
63e6cb1d62
|
remove parenthesis that confuse older php
|
2018-05-14 13:56:55 -04:00 |
|
Andrew Bauer
|
485f292943
|
fix php 5.4 compatibility - remove calls to empty
|
2018-05-14 12:32:48 -05:00 |
|
Isaac Connor
|
47ba435471
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-05-12 19:44:40 -04:00 |
|
Isaac Connor
|
bb76079d54
|
fix logic when snapshot.jpg doesn't exist. We need an actual frame, to get a Delta to tell ffmpeg which frame to use. So load the Frame with Score=MaxScore
|
2018-05-11 10:37:00 -04:00 |
|
Isaac Connor
|
b20cb5d0ae
|
Add all the other Event columns to fields
|
2018-05-11 10:36:14 -04:00 |
|
Isaac Connor
|
230a59cd8e
|
fix case where it wouldn't generate the snapshot.jpg because we hadn't specified whether to show a capture or analysis image
|
2018-05-11 09:53:24 -04:00 |
|
Isaac Connor
|
8b8bcbd1e2
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-05-10 17:47:12 -04:00 |
|
Isaac Connor
|
571b27a025
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-05-10 14:39:16 -04:00 |
|
Isaac Connor
|
c61deb422f
|
update to -zm versions
|
2018-05-10 14:38:49 -04:00 |
|
Isaac Connor
|
b2115f9dcf
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-05-08 13:34:03 -07:00 |
|
Isaac Connor
|
62edca6dcb
|
add fileSize to the api, and use it to add remote fileSize reporting in includes/Event
|
2018-05-08 13:33:56 -07:00 |
|
Isaac Connor
|
3c4befc73a
|
improve Name and Source filtering. Default to case insensitive text search.
|
2018-05-08 14:07:24 -04:00 |
|
Isaac Connor
|
e7bd5900bc
|
rough in a Storage Model
|
2018-05-07 14:09:05 -07:00 |
|
Isaac Connor
|
da7c953e3d
|
adda blank line
|
2018-05-07 14:08:32 -07:00 |
|
Isaac Connor
|
a4911d8f39
|
use Event object call for file_exists, which will check remotely. Make MissingFiles and ZeroSize be a link to filter results for those events
|
2018-05-07 14:08:17 -07:00 |
|
Isaac Connor
|
9127eb63dc
|
Implement file_exists function to determine either locally or through remote api calls whether the file for an event exists.
|
2018-05-07 14:07:30 -07:00 |
|
Isaac Connor
|
1a012c62ff
|
Add fileExists to event view
|
2018-05-07 14:07:03 -07:00 |
|
Isaac Connor
|
9c44f56f37
|
Add Storage to belongsTo. Implement Relative_Path and fileExists functions
|
2018-05-07 14:06:48 -07:00 |
|
Isaac Connor
|
5772ff9161
|
return default values for Width and Height
|
2018-05-05 12:49:00 -04:00 |
|
Isaac Connor
|
f2c099f1e4
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-05-04 16:01:25 -04:00 |
|
Isaac Connor
|
dbdf937a56
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-05-04 06:47:23 -07:00 |