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
|
5df2fbfff2
|
fix logic to handle no pre_event frames
|
2018-05-15 15:53:25 -04: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
|
4ca77fdd69
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-05-15 12:44:36 -04:00 |
|
Isaac Connor
|
98b2a3f6f0
|
improve structure/spacing
|
2018-05-15 12:44:24 -04:00 |
|
Isaac Connor
|
88b66fe5dd
|
Merge ../ZoneMinder.master into storageareas
|
2018-05-14 14:07:51 -04:00 |
|
Isaac Connor
|
038c5f4e1a
|
log the log line not the uninitialized sql
|
2018-05-14 13:57:26 -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 |
|
Andrew Bauer
|
6af74a96fc
|
add fedora 28 to build system, remove fedora 26
|
2018-05-13 18:36:58 -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
|
945825cdcb
|
Google code style, fix join() in that we weren't using the delimitere parameter
|
2018-05-12 14:37:41 -07:00 |
|
Isaac Connor
|
d9fff848e7
|
change Groups to a vector, add GroupNames function
|
2018-05-12 14:37:26 -07:00 |
|
Isaac Connor
|
1ef5226316
|
cleanup
|
2018-05-12 14:37:13 -07:00 |
|
Isaac Connor
|
b445ddc981
|
typo fix
|
2018-05-12 14:36:53 -07:00 |
|
Isaac Connor
|
4bbd8d6ab9
|
Use zmDbConnect in Database instead of duplicating all the connect code
|
2018-05-12 14:36:38 -07:00 |
|
Isaac Connor
|
5071fd1ba1
|
Add mysql_auto_reconnect and force autocommit on
|
2018-05-12 14:35:43 -07:00 |
|
Isaac Connor
|
1fed8f3428
|
finish handling a change of Realm. Actually makes it unneccessary to specify the Realm in ControlDevice
|
2018-05-11 13:14:54 -04:00 |
|
Isaac Connor
|
16e63f81df
|
fully specify ZoneMinder::Database::ZmDbConnect
|
2018-05-11 12:42:56 -04:00 |
|
Isaac Connor
|
0a5980ce2e
|
Fix prealarmcount > alarm_frames. If Alarm frames is 1 and PreEventCount == 0, then the old line would have evaluated to true. By making it > alarm_count instead of >= alarm_count-1, we get the same behaviour for non-zero preevent counts, and also since alarm_frames >= 1 always, we handle the preeventcount=0 case.
|
2018-05-11 12:18:24 -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 |
|
Andrew Bauer
|
9187d034c1
|
Merge pull request #2103 from TopView/patch-1
fixed typo
|
2018-05-11 07:35:39 -05:00 |
Howard
|
073dd34d65
|
fixed typo
|
2018-05-10 20:59:08 -07: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
|
2a5f05499e
|
Munge the config in the global configvals into the configs array before returning it.
|
2018-05-10 13:44:46 -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
|
a86b81d12e
|
Only set term_sent_at if we don't already have one, we may send the stop signal many times
|
2018-05-08 16:08:24 -04:00 |
|
Isaac Connor
|
e6d11bf147
|
block CHLD signals in send_stop, to prevent race condition
|
2018-05-08 15:52:33 -04:00 |
|
Isaac Connor
|
593167dee6
|
remove extra code killing processes after KILL_DELAY. check_for_processes_to_kill will kill everything off.
|
2018-05-08 15:29:34 -04:00 |
|
Isaac Connor
|
62b9662b48
|
Handle when process is not in cmd_hash
|
2018-05-08 14:12:53 -04: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
|
6bff8811e7
|
put back logReinit after forko
|
2018-05-08 12:52:40 -04:00 |
|
Isaac Connor
|
190ac69975
|
reintroduce FfmpegInterruptCallBack so that av_read_frame can be made to quit
|
2018-05-08 12:02:08 -04:00 |
|
Isaac Connor
|
5242b17b03
|
Done restartPending message should be a debug, not Info
|
2018-05-08 10:30:12 -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 |