Isaac Connor
|
ee1eef50cb
|
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
|
2018-02-18 11:00:55 -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
|
ec7f2e48d0
|
add back AnalysisFPS reporting and move the gettimeofday in after it is actually needed
|
2018-02-17 10:54:53 -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
|
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 |
|
Isaac Connor
|
2774fded57
|
add debugging and put NavBarHTML back in message
|
2018-02-14 11:57:45 -05:00 |
|
Isaac Connor
|
2e11c12d73
|
add debugging to logging
|
2018-02-14 11:56:54 -05:00 |
|
Isaac Connor
|
4df8cdc685
|
add auth_hash updating to the navbar reload.
|
2018-02-14 10:44:48 -05:00 |
|
Isaac Connor
|
af003227c3
|
Don't do day/hour/week/month totals from main events table anymore
|
2018-02-13 11:41:35 -05:00 |
|
Isaac Connor
|
c7a43a53f0
|
Sort the event records
|
2018-02-13 11:28:06 -05:00 |
|
Isaac Connor
|
535cdf6485
|
When there isn't an event for the given moment, play the previous one. If still no events found, popup live
|
2018-02-13 11:27:55 -05:00 |
|
Isaac Connor
|
6cfce1d5f2
|
Improve logging
|
2018-02-13 11:27:20 -05:00 |
|
Isaac Connor
|
9a19a9cddd
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-02-13 10:11:49 -05:00 |
|
Isaac Connor
|
744d776d9f
|
return when ReopenFfmpeg fails
|
2018-02-13 10:11:39 -05:00 |
|
Isaac Connor
|
162a08e81d
|
return when ReopenFfmpeg fails
|
2018-02-13 10:11:05 -05:00 |
|
Isaac Connor
|
ef72e585b9
|
Include id in the user object
|
2018-02-13 05:28:00 -05:00 |
|
Isaac Connor
|
657fda818b
|
code docs
|
2018-02-13 05:26:30 -05:00 |
|
Isaac Connor
|
4a0b3f6c40
|
Include id in the user object
|
2018-02-13 05:26:08 -05:00 |
|
Isaac Connor
|
a82e17ff4b
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-12 17:16:33 -05:00 |
|
Isaac Connor
|
9fa28106e5
|
return proper hostname when not using multiple servers
|
2018-02-12 14:44:58 -05:00 |
|
Isaac Connor
|
62b0a1ecdc
|
Add some debugging to tell what we are doing
|
2018-02-12 13:25:11 -05:00 |
|
Isaac Connor
|
4f57a40cb6
|
Update Monitor_Status after connection lost and when exiting
|
2018-02-12 13:24:19 -05:00 |
|
Isaac Connor
|
ad1b9699f1
|
Remove CssFileExtra
|
2018-02-11 14:18:40 -05:00 |
|
Isaac Connor
|
7abe7d6fe3
|
fix centering in buttons
|
2018-02-11 14:18:26 -05:00 |
|
Isaac Connor
|
c0eb0011f0
|
Make some errors just errors instead of fatal. Add a check for plural days in log cleaning
|
2018-02-11 14:18:10 -05:00 |
|
Isaac Connor
|
956f9ee193
|
if there is a custom term handler in place, call it when Fatal
|
2018-02-11 14:17:44 -05:00 |
|
Isaac Connor
|
498c4e625d
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-02-09 16:08:55 -05:00 |
|
Isaac Connor
|
717d00ac99
|
missing //
|
2018-02-09 16:08:44 -05:00 |
Isaac Connor
|
a35ba812b7
|
fix merging conditions
|
2018-02-09 07:57:52 -08:00 |
|
Isaac Connor
|
0052d1b02e
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-02-09 07:32:34 -08:00 |
|
Isaac Connor
|
08c359fdbc
|
add some margin to minTime and maxtime
|
2018-02-09 07:31:30 -08:00 |
|
Isaac Connor
|
63a214869e
|
rework montagereview to be more performant.
|
2018-02-09 07:31:19 -08:00 |