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 |
|
Andrew Bauer
|
530e10610e
|
Update entrypoint.sh
|
2018-01-16 20:14:42 -06:00 |
|
Andrew Bauer
|
fe0bd66f74
|
fix whitespace in service startup text
|
2018-01-16 20:12:26 -06:00 |
|
Andrew Bauer
|
7b3f72d7a2
|
update service startup text
|
2018-01-16 20:02:18 -06:00 |
Andy Bauer
|
6826ebff9f
|
new docker entrypoint script
|
2018-01-16 18:00:37 -06:00 |
|
Isaac Connor
|
fe7c54bc26
|
Fix Debug
|
2018-01-16 17:54:37 -05:00 |
|
Isaac Connor
|
7b452f6937
|
Fix Debug -> Logger::Debug
|
2018-01-16 11:15:59 -08:00 |
|
Isaac Connor
|
426976ddb7
|
cleanup return code
|
2018-01-16 14:04:44 -05:00 |
|
Isaac Connor
|
e78a40b45f
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-16 11:02:20 -08:00 |
|
Isaac Connor
|
27ebf1a4aa
|
Comment out debug code
|
2018-01-16 14:02:04 -05:00 |
|
Isaac Connor
|
aaa6c5cccb
|
Only delete files if no error
|
2018-01-16 14:01:26 -05:00 |
|
Isaac Connor
|
a8dde207e1
|
Warning should be a debug
|
2018-01-16 12:33:50 -05:00 |
|
Isaac Connor
|
9c184bcb42
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-16 08:50:13 -08:00 |
|
Isaac Connor
|
9f42871c86
|
Fix Zone Triggers, bump version
|
2018-01-16 11:49:17 -05:00 |
|
Isaac Connor
|
b09bb528a5
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-16 08:42:41 -08:00 |
|
Isaac Connor
|
26cea49f1a
|
handle nulls in event_prefix and label_format in Monitor::Reload
|
2018-01-16 11:08:35 -05:00 |
|
Isaac Connor
|
45ee7284f5
|
bump version
|
2018-01-16 09:32:24 -05:00 |
|
Isaac Connor
|
dfb7079f83
|
FIX update interval.
|
2018-01-16 09:32:18 -05:00 |
|
Isaac Connor
|
abec2ce4cd
|
Add code to optionally run zmstats.pl and zmaudit.pl
|
2018-01-16 09:31:58 -05:00 |
|
Isaac Connor
|
004fdbad9b
|
We don't need to update ZoneCount manually anymore
|
2018-01-16 09:31:23 -05:00 |
|
Isaac Connor
|
48b636c749
|
fix missing triggers on Events tables. Add triggers for ZoneCount updating.
|
2018-01-16 09:30:40 -05:00 |
|
Andrew Bauer
|
c0955e0043
|
link cakephp tmp folder to /var/tmp
This has be done for docker builds
|
2018-01-15 21:01:02 -06:00 |
|
Isaac Connor
|
f808d187c1
|
Fix logic update Server stats update line
|
2018-01-15 19:23:59 -05:00 |
|
Isaac Connor
|
bb0974044b
|
add Scheme to Events
|
2018-01-15 17:45:45 -05:00 |
|
Andrew Bauer
|
4af48a5885
|
silence a2enmod output
|
2018-01-15 14:40:04 -06:00 |