Commit Graph

10618 Commits

Author SHA1 Message Date
Andrew Bauer 9a8a72ba27
typo 2018-01-20 17:46:53 -06:00
Andrew Bauer 06c2c18135
fix url to display properly 2018-01-20 17:46:15 -06:00
Andrew Bauer 8dc6910bbd
Remove reference to zm 1.29, update description of isaac's ppa 2018-01-20 17:34:37 -06:00
Isaac Connor bd2da456f4 handle non-multi-server case when restarting monitors via API 2018-01-19 21:09:33 -05:00
Isaac Connor 6d46a02a9a DbReconnect if the db connection goes down 2018-01-19 18:25:24 -05:00
Isaac Connor 43d72decac Turn off extra debugging 2018-01-19 18:24:59 -05:00
Isaac Connor 1291835c45 do some output to tell use what we are doing during update process 2018-01-19 16:32:48 -05:00
Isaac Connor 2682686063 Must disconnect and reconnect before calling update script 2018-01-19 16:32:26 -05:00
Andrew Bauer 32bf57d35b docker support files moved to zmdockerfiles 2018-01-19 15:15:11 -06:00
Isaac Connor 9b7fee03c7 Add Server auto-selection 2018-01-19 11:00:46 -08:00
Isaac Connor 5cd3d14828 Merge branch 'storageareas' into tesla 2018-01-19 10:48:21 -08:00
Isaac Connor e372a490fa bump version 2018-01-19 13:32:58 -05:00
Isaac Connor dfce773341 We should return the value of DiskSpace 2018-01-19 13:32:28 -05:00
Isaac Connor a03ceec154 Fix Day=>Wek 2018-01-19 13:29:45 -05:00
Isaac 62704601ca We should return the value of DIskSpace 2018-01-19 19:22:43 +01:00
Isaac Connor bc792a8325 Use coalesce to handle NULLs 2018-01-19 13:09:46 -05:00
Isaac Connor e8603b6065 Use coalesce to handle NULLs 2018-01-19 13:08:13 -05:00
Isaac Connor b5d1e1e5a2 update triggers to use coalesce 2018-01-19 13:03:47 -05:00
Isaac Connor 033d8e9cd8 add update 2018-01-19 12:17:42 -05:00
Isaac Connor e26747b5cc show port when it's not the standard port 2018-01-19 12:15:26 -05:00
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