ebbb2359d3
gMerge branch 'master' into storageareas
2019-08-02 08:05:06 -04:00
7e6b0058d2
Update Zone buttons. Fix double submit. Fixes #2671
2019-08-02 08:04:38 -04:00
6a9464044b
Demote warnings about fixing non-monotonic dts to debug
2019-08-02 08:03:02 -04:00
6a425b6988
If token is present do token based auth and do not do anything with session
2019-08-01 10:02:31 -04:00
479e7c290c
cosmic is unsupported, don't build for it by default
2019-08-01 09:51:03 -04:00
d578f34ecc
Merge branch 'master' into storageareas
2019-07-31 20:51:03 -04:00
14ed777eeb
fix segfault when debbing is turned on for zma
2019-07-31 17:17:54 -04:00
90cb5d018a
Fix 2673 ( #2675 )
...
* Change MaxFPS to DECIMAL(5,3) to handle values like 1/60 = 0.017
* When fps < 1 we may need to wait longer than 10s. Also, we cannot sleep for a long time, because we may need to send a keep alive or check the command queue. So limit the sleep to 1s
* Bump version
* Update MaxFPS to Decimal(5,3)
* Fix missing ;
2019-07-31 11:42:38 -04:00
48ad8d47fc
Add capture_max_fps to monitor object instead of just calculating the delay.
2019-07-31 11:23:02 -04:00
7f19831e0c
Use isset when testing for existence of authash in session
2019-07-29 14:54:55 -04:00
5a93150f5b
Use isset when testing for existence of authash in session
2019-07-29 14:54:36 -04:00
e5ba108149
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-07-26 12:46:01 -04:00
8167ff2143
fix eslint
2019-07-26 12:28:02 -04:00
4b89ced889
Warn about waiting more than .5s instead of .1
2019-07-26 12:24:36 -04:00
e5c194e9ee
Fix return 403 status code
2019-07-26 12:22:04 -04:00
09934ed7f5
Fix sendTextFrame
2019-07-26 12:21:25 -04:00
3da12fd141
Add a bunch of debugging
2019-07-26 12:21:15 -04:00
b5a35e57b5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-07-26 10:54:02 -04:00
0643108ba4
Use fputs instead of fprintf. Spacing and google code style changes
2019-07-26 10:53:48 -04:00
547e80b1a9
Fix download and export button from events list. Fixes #2668 ( #2670 )
2019-07-24 12:31:43 -04:00
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
39262d55f5
Also show secondary storage area when viewing event
2019-07-24 11:26:07 -04:00
2d46f2adab
add Secondary Storage Area options.
2019-07-24 11:25:51 -04:00
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
1254e8ab67
Add AttrSecondaryStorageArea to lang
2019-07-24 11:24:50 -04:00
45afc2a534
introduce array_recursive_diff which we use to compare two arrays in Object::changes
2019-07-24 11:24:37 -04:00
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
341f4adbdf
Functions that change the Query must reset Query_json as well
2019-07-24 11:23:38 -04:00
aff081ad41
Must commit after COpyTo to release locks
2019-07-24 11:23:13 -04:00
58851d23d2
Add Secondary Storage support to the Event object
2019-07-24 11:22:55 -04:00
afa02e436d
Upgrade Storage perl object to use parent Object::find
2019-07-24 10:53:56 -04:00
57133691e9
Add update script for SecondaryStorageArea capability in Events and Filters
2019-07-24 10:53:23 -04:00
2d556e6402
Add SecondaryStorageId to Events
2019-07-24 10:52:32 -04:00
99f78c50af
Add Updating SecondaryStorageId when using CopyTo
2019-07-24 09:37:38 -04:00
98922b6788
Add SecondaryStorageId to Event so that we can update it
2019-07-24 09:37:16 -04:00
bb653b172c
Use hires time to give better bandwidth reporitng
2019-07-23 14:34:26 -04:00
d4eae18055
Merge branch 'master' into filter_add_copy
2019-07-23 13:06:17 -04:00
49621bf652
Only parse Sql if there is a Query in the filter
2019-07-23 12:58:03 -04:00
d3d0579454
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-07-23 10:14:34 -04:00
a4a144d2fa
Merge branch 'master' into filter_add_copy
2019-07-23 10:04:23 -04:00
88beb46c3e
Add FilterCopyEvents
2019-07-23 10:04:15 -04:00
df0aef89af
gracefully handle when window[fnName] doesn't exist
2019-07-23 10:03:28 -04:00
0e040fc2fc
Add click_autocopy function
2019-07-23 10:00:05 -04:00
346933126d
Update filter view to use Filter::find
2019-07-23 09:59:49 -04:00
9b6dedb35d
Update Filter saving action to use object set/save etc
2019-07-23 09:58:28 -04:00
35ec60ca03
Change Storage object to extend ZM_Object
2019-07-23 09:58:05 -04:00
7c52f8a4ae
Fixes and add Objects_Indexed_By_Id
2019-07-23 09:57:44 -04:00
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
fd95ab23e9
Add AutoCopy support
2019-07-23 09:55:27 -04:00
f9b5c8a1f4
If query is empty don't bother parsing it
2019-07-23 09:55:14 -04:00
Isaac Connor
Isaac Connor