Isaac Connor
|
a6a2239e5b
|
Fixes #2579 by putting the event Id into an attribute of the delete button. Also uses a button instead of a link. Also only does parent refresh if parent exists (#2662)
|
2019-07-24 11:39:21 -04:00 |
Isaac Connor
|
39262d55f5
|
Also show secondary storage area when viewing event
|
2019-07-24 11:26:07 -04:00 |
|
Isaac Connor
|
2d46f2adab
|
add Secondary Storage Area options.
|
2019-07-24 11:25:51 -04:00 |
|
Isaac Connor
|
1a0beab703
|
add Secondary Storage Area options. Storage array is now an array of Objects so use the Name key
|
2019-07-24 11:25:38 -04:00 |
|
Isaac Connor
|
1254e8ab67
|
Add AttrSecondaryStorageArea to lang
|
2019-07-24 11:24:50 -04:00 |
|
Isaac Connor
|
45afc2a534
|
introduce array_recursive_diff which we use to compare two arrays in Object::changes
|
2019-07-24 11:24:37 -04:00 |
|
Isaac Connor
|
e3a9d5d488
|
Rewrite changes to run through the keys of the passed in new values array, and handle object methods as well as basic values
|
2019-07-24 11:24:14 -04:00 |
|
Isaac Connor
|
341f4adbdf
|
Functions that change the Query must reset Query_json as well
|
2019-07-24 11:23:38 -04:00 |
|
Isaac Connor
|
aff081ad41
|
Must commit after COpyTo to release locks
|
2019-07-24 11:23:13 -04:00 |
|
Isaac Connor
|
58851d23d2
|
Add Secondary Storage support to the Event object
|
2019-07-24 11:22:55 -04:00 |
|
Isaac Connor
|
afa02e436d
|
Upgrade Storage perl object to use parent Object::find
|
2019-07-24 10:53:56 -04:00 |
|
Isaac Connor
|
57133691e9
|
Add update script for SecondaryStorageArea capability in Events and Filters
|
2019-07-24 10:53:23 -04:00 |
|
Isaac Connor
|
2d556e6402
|
Add SecondaryStorageId to Events
|
2019-07-24 10:52:32 -04:00 |
|
Isaac Connor
|
99f78c50af
|
Add Updating SecondaryStorageId when using CopyTo
|
2019-07-24 09:37:38 -04:00 |
|
Isaac Connor
|
98922b6788
|
Add SecondaryStorageId to Event so that we can update it
|
2019-07-24 09:37:16 -04:00 |
|
Isaac Connor
|
bb653b172c
|
Use hires time to give better bandwidth reporitng
|
2019-07-23 14:34:26 -04:00 |
|
Isaac Connor
|
d4eae18055
|
Merge branch 'master' into filter_add_copy
|
2019-07-23 13:06:17 -04:00 |
|
Isaac Connor
|
49621bf652
|
Only parse Sql if there is a Query in the filter
|
2019-07-23 12:58:03 -04:00 |
|
Isaac Connor
|
d3d0579454
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2019-07-23 10:14:34 -04:00 |
|
Isaac Connor
|
a4a144d2fa
|
Merge branch 'master' into filter_add_copy
|
2019-07-23 10:04:23 -04:00 |
|
Isaac Connor
|
88beb46c3e
|
Add FilterCopyEvents
|
2019-07-23 10:04:15 -04:00 |
|
Isaac Connor
|
df0aef89af
|
gracefully handle when window[fnName] doesn't exist
|
2019-07-23 10:03:28 -04:00 |
|
Isaac Connor
|
0e040fc2fc
|
Add click_autocopy function
|
2019-07-23 10:00:05 -04:00 |
|
Isaac Connor
|
346933126d
|
Update filter view to use Filter::find
|
2019-07-23 09:59:49 -04:00 |
|
Isaac Connor
|
9b6dedb35d
|
Update Filter saving action to use object set/save etc
|
2019-07-23 09:58:28 -04:00 |
|
Isaac Connor
|
35ec60ca03
|
Change Storage object to extend ZM_Object
|
2019-07-23 09:58:05 -04:00 |
|
Isaac Connor
|
7c52f8a4ae
|
Fixes and add Objects_Indexed_By_Id
|
2019-07-23 09:57:44 -04:00 |
|
Isaac Connor
|
b05aff1d5d
|
Update Filter Object to extend ZM_Object. Rename Query to Query_json and implement a Query function to parse Query_json
|
2019-07-23 09:57:16 -04:00 |
|
Isaac Connor
|
fd95ab23e9
|
Add AutoCopy support
|
2019-07-23 09:55:27 -04:00 |
|
Isaac Connor
|
f9b5c8a1f4
|
If query is empty don't bother parsing it
|
2019-07-23 09:55:14 -04:00 |
|
Isaac Connor
|
e821553265
|
Split MoveTo into CopyTo and MoveTo.
|
2019-07-23 09:54:39 -04:00 |
|
Isaac Connor
|
fe71a9abaa
|
php_errormsg is deprecated
|
2019-07-19 16:32:40 -04:00 |
|
Isaac Connor
|
1e0c39c632
|
mostly spacing cleanups. Don't bother setting pkt_duration on resampled frame
|
2019-07-19 16:28:18 -04:00 |
|
Isaac Connor
|
9a31f8792c
|
return proper error codes when failed auth or fail permissions
|
2019-07-19 13:55:35 -04:00 |
|
Isaac Connor
|
f3166663a5
|
unref hw_device_ctx on Close. I think this should release all the other hwaccel related stuff
|
2019-07-19 12:51:31 -04:00 |
|
Isaac Connor
|
fcee031785
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-07-17 21:10:46 -04:00 |
|
Isaac Connor
|
542d88b6a4
|
fix compile without HWCONTEXT
|
2019-07-17 21:10:24 -04:00 |
Pliable Pixels
|
a9d01ba3d2
|
Alarm api (#2665)
* fixed alarm api to use tokens if present
* clearer debug logs for tokens
* space
|
2019-07-17 20:38:58 -04:00 |
|
Pliable Pixels
|
2b7610a5ac
|
fixed ffmpeg log association to zm log levels (#2664)
|
2019-07-17 20:37:27 -04:00 |
|
Isaac Connor
|
75af397223
|
hwFrame isn't defined unless we have HWCONTEXT_H
|
2019-07-17 20:33:23 -04:00 |
|
Isaac Connor
|
34c141304d
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-07-17 10:07:29 -04:00 |
|
Isaac Connor
|
ef9fe2dbd6
|
Free up hwFrame, preventing memleak
|
2019-07-17 10:06:30 -04:00 |
|
Pliable Pixels
|
67168a2387
|
demote token log (#2663)
|
2019-07-12 14:31:39 -04:00 |
|
Isaac Connor
|
52e7cde66d
|
If Email has EIMOD, not only attach the image if it exists, but replace %EIMOD% with the link to it
|
2019-07-11 19:04:51 -04:00 |
|
Isaac Connor
|
05be9008c7
|
use FFMPEGInit to initialise ffmpeg instead of doing it ourselves
|
2019-07-11 17:57:11 -04:00 |
|
Isaac Connor
|
13c91bdf60
|
Add pts adjustment to the delayed flushed encoder packets
|
2019-07-11 17:56:53 -04:00 |
|
Isaac Connor
|
288f2f3e8f
|
Convert zm_dump_frame from a function to a define, this way we get line #'s from where we call zm_dump_frame instead of from the line in zm_ffmpeg where the function was.
|
2019-07-11 17:56:22 -04:00 |
|
Isaac Connor
|
d244aadee6
|
Fix #2655
|
2019-07-08 14:27:49 -04:00 |
|
Isaac Connor
|
df8c46f0f0
|
Fix #2657
|
2019-07-08 14:22:46 -04:00 |
|
Isaac Connor
|
5b896b5e5c
|
Replace password('admin') with the resulting string because use of password is deprecated
|
2019-07-08 14:16:57 -04:00 |