Isaac Connor
|
53f4276cb7
|
add thumbnails and an mp4 download in the events list
|
2018-09-25 16:00:01 -04:00 |
|
Isaac Connor
|
6aaa0fe39f
|
Merge branch 'add_export_to_filter' of github.com:/connortechnology/ZoneMinder into add_export_to_filter
|
2018-09-25 14:57:13 -04:00 |
|
Isaac Connor
|
01f1ffb591
|
Merge branch 'master' into add_export_to_filter
|
2018-09-25 14:54:06 -04:00 |
|
Isaac Connor
|
5615bfec40
|
some buttons need to be submit buttons. Correct Reset button and remove extra space in Delete button value
|
2018-09-25 14:47:23 -04:00 |
Isaac Connor
|
bf9ff8461c
|
Add WebSite to the Monitor type enumeration
|
2018-09-24 13:20:19 -04:00 |
|
Isaac Connor
|
c8c533ca2f
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-23 10:51:56 -04:00 |
|
Isaac Connor
|
c5b23807a4
|
put back overlay.js for log view.
|
2018-09-23 10:51:46 -04:00 |
Andrew Bauer
|
b8a2e71bb6
|
use base64_encode for monitor probe
We need to employ the same method of encoding as the onvif probe to avoid fixing one while breaking the other
|
2018-09-21 12:00:03 -05:00 |
|
Andrew Bauer
|
347c0d2ae4
|
fix whitespace
|
2018-09-20 13:41:13 -05:00 |
|
Andrew Bauer
|
ac9129b632
|
fix corrupted export downloads
|
2018-09-20 13:36:52 -05:00 |
|
Isaac Connor
|
999e4c6c43
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-20 13:37:46 -04:00 |
|
Isaac Connor
|
90d1d79e9a
|
Add missing AutoUpload field to Filter
|
2018-09-20 13:37:36 -04:00 |
Andy Bauer
|
f53533e61e
|
fix populating onvif probe data
|
2018-09-20 10:30:23 -05:00 |
|
Isaac Connor
|
ba4878d2b5
|
fix use of instead of ['limit']
|
2018-09-20 10:11:55 -04:00 |
|
Isaac Connor
|
503b40cb62
|
Need to cache the object not the row
|
2018-09-20 10:07:15 -04:00 |
|
Isaac Connor
|
6181e52c47
|
gracefully handle non-existence of imageFeed
|
2018-09-20 09:07:28 -04:00 |
|
Isaac Connor
|
c6e953c4a9
|
if Monitor is not found, return empty Monitor instead of null
|
2018-09-20 09:02:20 -04:00 |
|
Isaac Connor
|
c4108a2610
|
Fix missing quotes inc Event::Monitor
|
2018-09-20 08:59:15 -04:00 |
|
Isaac Connor
|
8a5c989cac
|
fix warning when editing users after a monitor has been deleted
|
2018-09-18 08:52:43 -04:00 |
|
Isaac Connor
|
7f98277571
|
Merge updated Monitor.php that does caching
|
2018-09-15 09:52:08 -04:00 |
|
Isaac Connor
|
b0c555599c
|
Merge updated objects from sa. Implements caching of objects and fixes logged errors when using the default storage group. Fixes #2209
|
2018-09-15 09:42:59 -04:00 |
|
Isaac Connor
|
fa55cec12c
|
fix error when scale is auto
|
2018-09-14 16:57:28 -04:00 |
|
Isaac Connor
|
f1442eba90
|
once we have found a match for our origin, break out of loop
|
2018-09-14 14:56:26 -04:00 |
|
Isaac Connor
|
d9b1d3ec11
|
fix CORS Headers when we are coming from a non-standard port. Use a regexp instead of == so that we match regardless of port
|
2018-09-14 14:52:33 -04:00 |
|
Isaac Connor
|
b5b71edbf6
|
Make a Url function in the Monitor object to use the Server->Url + Port. Default to port used in current url. Fixes problems with using something other than port 80
|
2018-09-14 14:26:45 -04:00 |
|
Andrew Bauer
|
b3565fb983
|
remove file that should not be there
|
2018-09-12 07:02:57 -05:00 |
|
Andrew Bauer
|
c66dd25ebb
|
implement collapsible headers (#2203)
|
2018-09-11 17:39:40 -04:00 |
|
Isaac Connor
|
eef928a742
|
fix find_all => find
|
2018-09-11 14:31:03 -04:00 |
|
Isaac Connor
|
684f48979a
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-11 14:30:19 -04:00 |
|
Isaac Connor
|
8608fc97be
|
fix trms=>terms
|
2018-09-10 15:11:57 -04:00 |
|
Isaac Connor
|
0ee261fae3
|
get rid of code that hid the close/back button on events if there was no history.
|
2018-09-10 15:11:41 -04:00 |
|
Isaac Connor
|
534aebb21f
|
When loading previous and subsequent log lines, merge the fields in the filters instead of replacing
|
2018-09-09 16:36:09 -04:00 |
|
Isaac Connor
|
55dcb161ae
|
find should always return an array
|
2018-09-09 13:59:10 -04:00 |
|
Isaac Connor
|
b4f80fbe11
|
Always return an array from find
|
2018-09-09 13:56:29 -04:00 |
|
Isaac Connor
|
b8f6617db3
|
fix another instance of find_all
|
2018-09-09 12:15:06 -04:00 |
|
Isaac Connor
|
dfdac2ed70
|
make find and find_one functions consistent across Objects
|
2018-09-07 16:31:11 -04:00 |
|
Isaac Connor
|
40292f3dad
|
Add Compression flag
|
2018-09-07 09:08:33 -04:00 |
|
Isaac Connor
|
e21a7a769b
|
add ExportCompress
|
2018-09-05 11:13:32 -04:00 |
|
Isaac Connor
|
d5cab088d6
|
Merge branch 'master' into add_export_to_filter
|
2018-09-05 10:33:10 -04:00 |
|
Isaac Connor
|
f4c2d8adea
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-03 12:29:09 -04:00 |
|
Andrew Bauer
|
e5a2581dcc
|
optionhelp - support links markdown style (#2198)
|
2018-09-03 09:56:52 -04:00 |
|
Isaac Connor
|
9ec415b30a
|
Just reload the event view instead of dynamically updating the stream. Fixes #2196
|
2018-08-31 15:56:21 -04:00 |
|
Isaac Connor
|
798aab84f3
|
whitespace changes
|
2018-08-31 11:58:33 -04:00 |
|
Isaac Connor
|
623d31edae
|
Don't do csrf for view=image
|
2018-08-31 11:58:17 -04:00 |
|
Isaac Connor
|
7ee80e7cca
|
Debug lines should be debug, not warning
|
2018-08-31 11:58:03 -04:00 |
|
Isaac Connor
|
57d5e28870
|
clear output buffer before sending image. Adjust filename for saveAs when doing a scaled image. whitespace corrections. More Debug output
|
2018-08-31 11:57:47 -04:00 |
|
Isaac Connor
|
0823b28712
|
whitespace changes. Make Privacy test an else so that PRIVACY checks don't happen if not logged in
|
2018-08-31 10:37:11 -04:00 |
|
Isaac Connor
|
4b30ea7877
|
cleanup, whitespace
|
2018-08-31 10:35:23 -04:00 |
|
Isaac Connor
|
799b34eee8
|
handle xhr errors like when auth is no longer valid. Do a page refresh when this happens
|
2018-08-31 10:34:54 -04:00 |
|
Isaac Connor
|
b1fe80a0bd
|
Add JSON/MaybeXS to dependencies, replacing JSON/Any
|
2018-08-30 18:30:33 -04:00 |