Isaac Connor
|
a888dac834
|
source files in /etc/zm/conf.d as well
|
2018-02-23 09:30:47 -05:00 |
|
Isaac Connor
|
cece2f35f0
|
remove triggers from zm_create.sql.in as they are now contained in triggers.sql
|
2018-02-23 07:50:05 -05:00 |
|
Isaac Connor
|
0ffb13648c
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-02-23 07:46:49 -05:00 |
|
Isaac Connor
|
0a6b463301
|
FIx MontageLayout=>MontageLayouts
|
2018-02-23 07:46:37 -05:00 |
|
Isaac Connor
|
834edafc63
|
install triggers as well
|
2018-02-23 07:46:24 -05:00 |
Isaac Connor
|
5b55bef721
|
Add support for h264_mmal
|
2018-02-22 18:33:11 -05:00 |
|
Isaac Connor
|
9480adcc31
|
include authentication info when building the link to mp4
|
2018-02-22 13:05:53 -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
|
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
|
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
|
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
|
e83586dbe1
|
Rename Term to Terminal to differentiate between Terminate
|
2018-02-13 06:23:18 -05:00 |