Commit Graph

10795 Commits

Author SHA1 Message Date
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
Andrew Bauer 7451afcfab
delete extra apostraphe 2018-01-15 11:13:26 -06:00
Andrew Bauer 31cc03eafc
fix datatype issue with BTTV Video presets 2018-01-15 09:45:40 -06:00
Andrew Bauer d54f3f7168
fix misaligned fields in Axis & Qihan presets 2018-01-15 09:15:57 -06:00
Andrew Bauer 80362f99fa fix misaligned db fields for certain presets (#2034) 2018-01-14 21:14:30 -05:00
Andrew Bauer 40928b2f3c
Update README.md 2018-01-14 16:41:21 -06:00
Andrew Bauer e1f8278712
Update ISSUE_TEMPLATE.md 2018-01-14 15:24:47 -06:00
Andrew Bauer d53f3e8048
Update README.md 2018-01-14 15:21:40 -06:00
Andy Bauer 0994b1f211 Dockerfile moved to ZoneMinder/zmdockerfiles 2018-01-14 14:54:10 -06:00
Isaac Connor 9284e26512 get rid of the snapshot setting. If we aren't storing all frames, then we should always store the snapshot. 2018-01-13 15:15:14 -05:00
Isaac Connor 1d6c9d6edd Empty Storage Name should not be Fatal 2018-01-13 10:14:11 -05:00
Isaac Connor bfa31297be Merge branch 'storageareas' into tesla 2018-01-12 11:26:19 -08:00
Isaac Connor 4b37c6fc42 Change the Group dropdown to a single indented dropdown, and use chosen on it 2018-01-12 11:25:15 -08:00
Isaac Connor c139f7a1bf we don't need the group setting in the url 2018-01-12 11:24:52 -08:00
Isaac Connor 5f8756d7ad Set Tesla defaults for new monitors 2018-01-12 08:11:37 -08:00
Isaac Connor ff9f43b5a1 put back code to switch to add_monitors 2018-01-12 08:11:25 -08:00
Isaac Connor 95c3c26eda cleanup old Add Monitr button 2018-01-12 08:11:07 -08:00