Isaac Connor
|
95f054c1e6
|
Show entire path for ffmpeg monitors. Strip out username/password though
|
2018-01-18 12:40:41 -08:00 |
|
Isaac Connor
|
484a361af8
|
use Object methods to restart zmc and zma. restart them on save of existing Monitor
|
2018-01-18 12:40:10 -08:00 |
|
Isaac Connor
|
30b0d2c5b1
|
Turn off debug
|
2018-01-18 12:39:50 -08:00 |
|
Isaac Connor
|
c08cbdb9dd
|
Turn off debug
|
2018-01-18 12:39:39 -08:00 |
|
Isaac Connor
|
f9d8c349e1
|
Move unparse_url from add_monitors to functions to make it generally available
|
2018-01-18 12:39:08 -08:00 |
|
Isaac Connor
|
04eef58883
|
Add Triggers to Monitors field to quiet error
|
2018-01-18 12:38:48 -08:00 |
|
Isaac Connor
|
cdfa565579
|
Fix restarting Monitor
|
2018-01-18 12:38:26 -08:00 |
|
Isaac Connor
|
ecd5e01b92
|
Show port when using Remote Method and Port is non-standard
|
2018-01-18 10:21:05 -08:00 |
|
Isaac Connor
|
274e8e982c
|
Merge branch 'storageareas' into tesla
|
2018-01-18 08:42:12 -08:00 |
Isaac Connor
|
5472a1a012
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-18 11:40:37 -05:00 |
|
Isaac Connor
|
59a1272307
|
bump version
|
2018-01-18 11:39:33 -05:00 |
|
Isaac Connor
|
314390a161
|
restructure indexes on the various Events tables. Use two separate indexes for MonitorId and StartTime because we access these tables using one or the other, but rarely both
|
2018-01-18 11:39:23 -05:00 |
|
Isaac Connor
|
1dbd8405a4
|
restructure indexes on the various Events tables. Use two separate indexes for MonitorId and StartTime because we access these tables using one or the other, but rarely both
|
2018-01-18 11:39:09 -05:00 |
|
Isaac Connor
|
715adb5acb
|
add locking to Event moving and diskspace updating.
|
2018-01-18 11:38:08 -05:00 |
Andy Bauer
|
95edf1b2a8
|
fix typo
|
2018-01-18 09:35:04 -06:00 |
|
Andy Bauer
|
2e4a20dfba
|
entrypoint.sh - add multi-distro compatibility
|
2018-01-18 09:08:09 -06:00 |
Andrew Bauer
|
9d28836e57
|
Merge pull request #2036 from ZoneMinder/fix_export
Add a few more extensions to the list of files to include in export
|
2018-01-18 08:34:08 -06:00 |
|
Andrew Bauer
|
b7258bb6c1
|
Merge pull request #2037 from kb5won/patch-1
Update packpack.rst
|
2018-01-18 08:33:18 -06:00 |
Brian Gallimore
|
9df7349e8e
|
Update packpack.rst
added path to git clone command. (I'm following install guide for first time and that step didn't work without the path)
|
2018-01-17 19:57:45 -06:00 |
|
Isaac Connor
|
55fa86c7be
|
Add a few more extensions to the list of files to include in export
|
2018-01-17 16:57:38 -05:00 |
|
Isaac Connor
|
ace66cf977
|
show port in source column
|
2018-01-17 13:33:22 -08:00 |
|
Isaac Connor
|
e977e4177a
|
Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla
|
2018-01-17 13:27:59 -08:00 |
|
Isaac Connor
|
494d080740
|
show port in source column
|
2018-01-17 13:27:44 -08:00 |
|
Isaac Connor
|
b847dddfc9
|
Merge branch 'storageareas' into tesla
|
2018-01-17 13:00:28 -08:00 |
|
Isaac Connor
|
655d7be3c9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-17 12:59:59 -08:00 |
|
Isaac Connor
|
eb92a1ed8b
|
merge updates that fix Event moving
|
2018-01-17 12:59:34 -08:00 |
|
Isaac Connor
|
4baf8fd3ad
|
Merge branch 'storageareas' into tesla
|
2018-01-17 12:58:35 -08:00 |
|
Isaac Connor
|
b71581922f
|
Only update db record if there is a change in diskspace
|
2018-01-17 12:56:37 -08:00 |
|
Isaac Connor
|
ad8c775507
|
Only update db record if there is a change in diskspace
|
2018-01-17 12:53:23 -08:00 |
|
Andrew Bauer
|
6c5dd0d395
|
Update zmlinkcontent.sh.in
|
2018-01-17 14:46:21 -06:00 |
|
Andrew Bauer
|
285a3a2958
|
zmlinkcontent.sh - only symlink events & images folder when -o flag is set
|
2018-01-17 14:41:44 -06:00 |
|
Isaac Connor
|
10bd7cbf7f
|
Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla
|
2018-01-17 12:29:02 -08:00 |
|
Isaac Connor
|
4fecdbd0fa
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-17 12:28:33 -08:00 |
|
Isaac Connor
|
ba7f21b022
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-17 12:26:12 -08:00 |
|
Isaac Connor
|
212bfd4a2c
|
add Monitor to info shown on event
|
2018-01-17 12:20:15 -08:00 |
|
Isaac Connor
|
5e33e6732a
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-17 12:00:31 -08:00 |
|
Isaac Connor
|
93623f3fd8
|
fix filtering by monitor in montagereview
|
2018-01-17 11:59:54 -08:00 |
|
Isaac Connor
|
1fbb5bc0f8
|
Fix zmaudit.pl => zmaudit, etc.
|
2018-01-17 14:22:04 -05:00 |
|
Andrew Bauer
|
617331ef32
|
fix apache alias
|
2018-01-17 10:38:20 -06:00 |
|
Andrew Bauer
|
5d0defd9fa
|
zmlinkcontent.sh - modify temp folder link command
|
2018-01-17 09:58:18 -06:00 |
|
Isaac Connor
|
360a10276f
|
Fix. We were deleting the keyframe that we wanted to keep.
|
2018-01-17 10:01:48 -05:00 |
|
Isaac Connor
|
e8dddac142
|
only rename the columns if they exist. Makes this update re-runnable
|
2018-01-17 10:01:16 -05:00 |
|
Isaac Connor
|
687d797303
|
Only log debug message about excluding audio if there is an audio stream
|
2018-01-17 09:53:03 -05:00 |
|
Andrew Bauer
|
064be68efa
|
fix typo
|
2018-01-17 08:46:38 -06:00 |
|
Isaac Connor
|
7f4deef4a9
|
Move debug comment about opening audio codec into the part where the audio codec is opened
|
2018-01-17 09:21:17 -05:00 |
|
Andrew Bauer
|
8c8c257799
|
log folder check moved to zmlinkcontent.sh
|
2018-01-17 08:18:41 -06:00 |
|
Andrew Bauer
|
0ddf9633ed
|
zmlinkcontent.sh - verify zm temp and log folders
|
2018-01-17 08:16:15 -06:00 |
|
Andrew Bauer
|
0305dfea92
|
Update entrypoint.sh
|
2018-01-16 20:47:23 -06:00 |
|
Isaac Connor
|
20962cda0d
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-16 18:45:28 -08:00 |
|
Isaac Connor
|
306e9a75ee
|
Fix issues with a period in the column name
|
2018-01-16 21:45:01 -05:00 |