Isaac Connor
|
d5295a4464
|
Fix segfaults and valgrind complaints. Initialize vncClientData, handle failure to connect freeing our client.
|
2020-11-17 11:08:11 -05:00 |
|
Isaac Connor
|
ec5e6b392b
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-11-16 11:33:00 -05:00 |
|
Isaac Connor
|
5bf5d58ac1
|
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
|
2020-11-16 11:32:50 -05:00 |
|
Isaac Connor
|
a47b72af49
|
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
|
2020-11-16 11:31:36 -05:00 |
Andrew Bauer
|
a2b5271835
|
fix copy/paste typo
|
2020-11-14 17:34:59 -06:00 |
|
Andrew Bauer
|
0ffb5e153c
|
modify FilterTerm to support Frames view searches
|
2020-11-14 17:33:18 -06:00 |
|
Andrew Bauer
|
416d68a971
|
rough in support for frames view search function
|
2020-11-14 16:49:22 -06:00 |
|
Andrew Bauer
|
45fbdfa050
|
rough in support for frames view search function
|
2020-11-14 16:01:34 -06:00 |
|
Andrew Bauer
|
f3756def08
|
deploy server side pagination for frames view
|
2020-11-14 14:45:22 -06:00 |
|
Andrew Bauer
|
9aa6fea6a3
|
frames view server pagination WIP
|
2020-11-14 14:19:28 -06:00 |
|
Andrew Bauer
|
f88d721ae3
|
fix issue with events view and ALL pagination
|
2020-11-14 10:27:33 -06:00 |
|
Isaac Connor
|
f32d10a1ab
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-13 17:16:13 -05:00 |
|
Isaac Connor
|
66f7cc55dc
|
Spacing code comments, quotes
|
2020-11-13 17:05:23 -05:00 |
|
Isaac Connor
|
d2a203014f
|
rename diagpipe-r so that we don't have to create directories in SOCKS_DIR
|
2020-11-13 17:05:03 -05:00 |
|
Isaac Connor
|
a0dcdd135a
|
DefaultRate and DefaultScale are Monitor properties, so just load them in a Monitor object so we don't have to JOIN the Monitors table
|
2020-11-13 17:04:22 -05:00 |
|
Isaac Connor
|
f1b8266e26
|
Only join storage and Monitors if necessary
|
2020-11-13 17:03:51 -05:00 |
|
Andrew Bauer
|
52e747791d
|
rough in frames server pagination backend
|
2020-11-13 12:34:01 -06:00 |
|
Isaac Connor
|
23f27d5a11
|
include frame_type in debug message
|
2020-11-13 12:43:31 -05:00 |
|
Isaac Connor
|
08a8155b47
|
Implement a Monitor::disconnect function. Fix Fatals during connect and cleanup Analysis Monitor code to wait around for zmc. Handle zmc going away gracefully. Fixes a slow zma startup due to zmc not being setup yet.
|
2020-11-13 12:27:51 -05:00 |
|
Isaac Connor
|
da99426535
|
if monitor is not found call loadMonitors to make sure it isn't new
|
2020-11-13 10:40:55 -05:00 |
|
Isaac Connor
|
a581cb9de1
|
Make various text input options be 90%
|
2020-11-13 10:18:35 -05:00 |
|
Isaac Connor
|
70ebd570e0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-13 09:52:10 -05:00 |
|
Isaac Connor
|
3cf31435a7
|
fix next/prev buttons by correcting the sort_field when it is StartTime or EndTime
|
2020-11-13 09:51:54 -05:00 |
|
Andrew Bauer
|
c0225a35aa
|
use different variable assignment for clarity
|
2020-11-13 07:24:17 -06:00 |
|
Andrew Bauer
|
a15c8ea7d8
|
Merge pull request #3072 from ZoneMinder/iconnor_ajax_event_changes
Rework code to use Filter methods to generate advanced search
|
2020-11-13 07:10:08 -06:00 |
|
Isaac Connor
|
ad4d0efba6
|
121 frames is too many, use >= instead
|
2020-11-12 17:00:32 -05:00 |
|
Isaac Connor
|
35de23c0d9
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-12 13:27:28 -05:00 |
|
Isaac Connor
|
bbc2c2a607
|
Crud has more than 1 friend
|
2020-11-12 13:27:10 -05:00 |
|
Andrew Bauer
|
c8efddddf5
|
fix typo
|
2020-11-12 12:27:06 -06:00 |
|
Isaac Connor
|
de74a15ab1
|
Move diag_fifo pipes in SOCKS_DIR instead of assigned Storage area. Storage areas could be a fs that cannot handle sockets or fifos like NFS.
|
2020-11-12 11:53:51 -05:00 |
|
Isaac Connor
|
645dca6bc9
|
Use FriendsOfCake 3.2.0 Crud
|
2020-11-12 09:59:32 -05:00 |
|
Isaac Connor
|
7faf774cd0
|
Use FriendsOfCake crud 3.2.0
|
2020-11-12 09:15:02 -05:00 |
Isaac Connor
|
52b4c6b089
|
Merge pull request #3076 from BlueMax/zmlinkcontent
Honor conf.d (zmlinkcontent.sh)
|
2020-11-11 20:48:05 -05:00 |
|
Isaac Connor
|
f91dcc9b60
|
declar rc as int
|
2020-11-11 20:05:47 -05:00 |
Bluemax
|
02f2c86d43
|
Honor conf.d (zmlinkcontent.sh)
Signed-off-by: Bluemax <1403092+BlueMax@users.noreply.github.com>
|
2020-11-12 01:32:15 +01:00 |
|
Isaac Connor
|
77c177c482
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-11 17:43:40 -05:00 |
|
Isaac Connor
|
9636a76ccf
|
drop db lock before reporting mysql_errors
|
2020-11-11 17:42:29 -05:00 |
|
Isaac Connor
|
7b764d04d3
|
Fix use of next when it should be return. Improve some logging of errors.
|
2020-11-11 17:40:31 -05:00 |
|
Isaac Connor
|
95f8aad19b
|
Fix detection of filter['id']
|
2020-11-11 17:39:55 -05:00 |
|
Isaac Connor
|
fe733fe1e6
|
Must use & instead of & in filter redirect
|
2020-11-11 17:39:37 -05:00 |
|
Isaac Connor
|
73e8c04b6f
|
Fix encoding of = in filter['Id']. Fixes redirect after saving
|
2020-11-11 17:39:20 -05:00 |
|
Isaac Connor
|
076d649189
|
Include Record Monitors in zmtrigger
|
2020-11-11 16:12:30 -05:00 |
|
Isaac Connor
|
4fdf7f79ae
|
Include Record monitors in zmtrigger.
|
2020-11-11 16:05:58 -05:00 |
|
Isaac Connor
|
f855f207e2
|
Limit that # of db frames to buffer to 120 because the sql will exceed 8192.
|
2020-11-11 14:03:08 -05:00 |
|
Isaac Connor
|
d663683f47
|
Add a bunch of debug statements to figure out crash
|
2020-11-11 12:43:41 -05:00 |
|
Isaac Connor
|
2c5b13d001
|
Revert to FriendsOfCake instead of our fork, as they have merged our patch.
|
2020-11-11 12:09:25 -05:00 |
|
Isaac Connor
|
77c810d43b
|
Merge branch 'master' of github.com:connortechnology/ZoneMinder
|
2020-11-11 12:09:08 -05:00 |
|
Isaac Connor
|
736e108b66
|
Revert to FriendsOfCake instead of our fork, as they have merged our patch.
|
2020-11-11 12:04:55 -05:00 |
|
Isaac Connor
|
52c7cc5869
|
reorganize code. Remove Server caching as it is done in Object.php.
|
2020-11-11 11:49:44 -05:00 |
|
Isaac Connor
|
0aef0adf48
|
Fix more Monitors.Id => Monitor_Status.MonitorId
|
2020-11-11 11:32:54 -05:00 |