Commit Graph

10798 Commits

Author SHA1 Message Date
Isaac Connor f4b6360f14 bump version 2018-01-19 12:15:12 -05:00
Isaac Connor 2ce68e83c5 Update TotalEvents on event_insertion 2018-01-19 12:15:05 -05:00
Isaac Connor 8935b77a12 Add a CTRL-C INT handler as well. Log more info about deleting events 2018-01-19 12:14:36 -05:00
Isaac Connor 17a29f7e83 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-19 11:40:14 -05:00
Isaac Connor 4d9f90488f Add a TERM and HUP handler, clean up pid file on term. Add --force command line option to tell zmaudit.pl to continue even if a pid file exists. 2018-01-19 11:40:07 -05:00
Isaac Connor 9fb1074875 add auto-scheme detection from path. Fix de-tainting in delete_files 2018-01-19 11:39:31 -05:00
Isaac Connor 3749eb3e6f Only send kill once. No point in repeating it 2018-01-19 08:19:10 -08:00
Isaac Connor 773ed11742 use Object methods to restart zmc and zma. restart them on save of existing Monitor 2018-01-19 08:17:53 -08:00
Isaac Connor d1dbf4cc31 Turn off debug 2018-01-19 08:17:33 -08:00
Isaac Connor 3abd873c34 Turn off debug 2018-01-19 08:17:17 -08:00
Isaac Connor 0f3cf33565 Move unparse_url from add_monitors to functions to make it generally available 2018-01-19 08:16:52 -08:00
Isaac Connor 2720b254ff Add Triggers to Monitors field to quiet error 2018-01-19 08:16:41 -08:00
Isaac Connor d586faf7fb Fix restarting Monitor 2018-01-19 08:16:28 -08:00
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