Isaac Connor
|
a19e6b619c
|
add Encoder to Monitors
|
2018-02-28 07:17:52 -08:00 |
|
Isaac Connor
|
c443168389
|
split out codec and encoder, allowing one to specify which encoder to use
|
2018-02-28 07:17:16 -08:00 |
Isaac Connor
|
84b42ef4d7
|
workarouns for omx
|
2018-02-22 11:43:04 -05:00 |
|
Isaac Connor
|
83785ac73f
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-22 09:41:50 -05:00 |
|
Isaac Connor
|
65f3a9b916
|
try crf instead of preset ultrafast
|
2018-02-22 09:34:50 -05:00 |
Isaac Connor
|
3eaf95c607
|
handle Storage reload request
|
2018-02-21 14:09:51 -05:00 |
|
Isaac Connor
|
449ac87af1
|
force reload on Storage in Event object when moving
|
2018-02-21 14:09:12 -05:00 |
|
Isaac Connor
|
c5081d1e4e
|
drop session before executing filter
|
2018-02-21 13:54:06 -05:00 |
|
Isaac Connor
|
460b0b0ab9
|
add an example monit config
|
2018-02-21 13:12:25 -05:00 |
|
Isaac Connor
|
52bca9d3ae
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-02-20 22:48:45 -05:00 |
|
Isaac Connor
|
13ef478820
|
refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals.
|
2018-02-20 22:48:34 -05:00 |
|
Isaac Connor
|
0ad01f09bd
|
refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals.
|
2018-02-20 22:48:23 -05:00 |
Isaac Connor
|
1981359d69
|
fixes, use summaries from Events_Day/etc instead of Events table
|
2018-02-19 19:45:21 -05:00 |
|
Isaac Connor
|
678634916f
|
fix event insert trigger
|
2018-02-19 17:29:30 -05:00 |
|
Isaac Connor
|
7d88e25ef9
|
simplify thumbnail/snapshot usage a bit
|
2018-02-19 17:25:49 -05:00 |
|
Isaac Connor
|
af560b8291
|
SIG{TERM} can be empty
|
2018-02-19 15:14:36 -05:00 |
|
Isaac Connor
|
e4ec1712f4
|
remove the table creation/dropping and a if/elseif fix
|
2018-02-18 11:48:00 -05:00 |
|
Isaac Connor
|
e18a14337f
|
use path to triggers.sql
|
2018-02-18 11:47:03 -05:00 |
|
Isaac Connor
|
fe0ccafae8
|
add missing ;
|
2018-02-18 11:29:22 -05:00 |
|
Isaac Connor
|
ddeb2e61ef
|
add error logging
|
2018-02-18 11:29:15 -05:00 |
|
Isaac Connor
|
d52277b283
|
update monitor counts
|
2018-02-18 11:28:58 -05:00 |
|
Isaac Connor
|
4b04b1ee7c
|
remove unwanted space
|
2018-02-18 11:19:20 -05:00 |
|
Isaac Connor
|
0a63797bd4
|
bump version
|
2018-02-18 11:12:40 -05:00 |
|
Isaac Connor
|
94212eda2f
|
fix triggers
|
2018-02-18 11:01:33 -05:00 |
|
Isaac Connor
|
f3065bd8f6
|
Source doesn't really work
|
2018-02-18 10:59:36 -05:00 |
|
Isaac Connor
|
50eaa690d7
|
just source the complete list of triggers
|
2018-02-17 13:00:24 -05:00 |
|
Isaac Connor
|
670a979a0e
|
source triggers.sql
|
2018-02-17 12:59:53 -05:00 |
|
Isaac Connor
|
e991e2a05d
|
fix some triggers
|
2018-02-17 12:57:21 -05:00 |
|
Isaac Connor
|
d514e95606
|
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
|
2018-02-17 12:26:08 -05:00 |
|
Isaac Connor
|
e634e0addc
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-02-17 12:25:42 -05:00 |
|
Isaac Connor
|
77426a7838
|
term to terminal for clarity
|
2018-02-17 12:25:05 -05:00 |
|
Isaac Connor
|
e6d9292dd0
|
term to terminal for clarity
|
2018-02-17 12:25:00 -05:00 |
|
Isaac Connor
|
9caa71233a
|
catch another EOF case
|
2018-02-17 11:07:06 -05:00 |
|
Isaac Connor
|
7702e09ec2
|
merge fixes
|
2018-02-16 16:05:30 -05:00 |
|
Isaac Connor
|
84b7e85259
|
Add a mutex around mysql operations
|
2018-02-15 15:54:13 -05:00 |
|
Isaac Connor
|
10a30452fb
|
fix logic when clearing queue, we were deleting packets endlessly.
|
2018-02-15 14:08:21 -05:00 |
|
Isaac Connor
|
9fd2b6be52
|
fix fps reporting
|
2018-02-15 14:07:55 -05:00 |
|
Isaac Connor
|
399b5159a4
|
spacing and comment out some debug. Also maybe fix build when v4l1 is not present
|
2018-02-15 14:07:40 -05:00 |
|
Isaac Connor
|
e7ec1086ea
|
rework zmc delay code to be more readable and use few gettimeofday calls and be more efficient
|
2018-02-15 14:07:05 -05:00 |
|
Isaac Connor
|
6883350e47
|
spacing/quotes/google code style. Always close and reopen logfile, as the filename may have changed
|
2018-02-15 10:00:13 -05:00 |
|
Isaac Connor
|
ebb0c9eec6
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-14 13:56:30 -05:00 |
|
Isaac Connor
|
b5e0745ac7
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-14 13:56:03 -05:00 |
|
Isaac Connor
|
505e726636
|
turn off debug
|
2018-02-14 13:51:49 -05:00 |
|
Isaac Connor
|
d6d62cfbe3
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-02-14 13:50:27 -05:00 |
|
Isaac Connor
|
8ba02d8e0e
|
Fix re-opening log file. If there was no change in File Log level, then it wouldn't close and reopen, but the filename might have changed, so we have to.
|
2018-02-14 13:50:16 -05:00 |
|
Isaac Connor
|
eeb7190812
|
fix rand replacing in image url
|
2018-02-14 13:16:30 -05:00 |
|
Isaac Connor
|
4c1abf93ba
|
fixup navbarreloader wrt auth_hash
|
2018-02-14 13:16:14 -05:00 |
|
Isaac Connor
|
002f22f685
|
generateAuthHash is already called earlier in index.php, so it will always be up to date. Just include it in the response.
|
2018-02-14 13:15:22 -05:00 |
|
Isaac Connor
|
45bf4544ca
|
rename SetImageSource to getImageSource which is what it actually does
|
2018-02-14 11:58:47 -05:00 |
|
Isaac Connor
|
a09bf3b097
|
slightly improve auth debugging
|
2018-02-14 11:58:00 -05:00 |