Commit Graph

10430 Commits

Author SHA1 Message Date
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
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
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 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 2c121fb784 If we get a term signal while waiting for zmc, die. 2018-01-12 07:12:54 -08:00
Isaac 3c55557c77 Handle to val in a filter term 2018-01-11 22:53:53 +01:00
Isaac 12d310a9cb Cleanup 2018-01-11 22:53:34 +01:00
Isaac e7274a8f91 cleanup. Restart zma when restarting zmc because it may hold the mmap open 2018-01-11 22:53:26 +01:00
Isaac Connor 8ef736f1d4 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-11 15:00:19 -05:00
Isaac Connor b86d32c005 When we need to restart zmc, we may need to restart zma due to not enough space in /dev/shm. 2018-01-11 15:00:05 -05:00
Isaac Connor 666005fb5d fix single event replay by fixing the reference to player which should be vid 2018-01-11 14:42:00 -05:00
Isaac Connor 4d342abf53 fixes 2018-01-11 14:34:57 -05:00
Isaac Connor b013da6b95 Fix ptz controls. Something has changed in the way the Event object works, but we don't actually need it. 2018-01-11 13:14:11 -05:00
Isaac Connor 6a36db0b6d move flat skin to base. 2018-01-11 12:24:53 -05:00
Isaac Connor 3ba6760f1b increase logout popup size 2018-01-11 10:58:06 -05:00
Isaac Connor 3b81cb9eed Replace ZoneMinder with ZM_WEB_TITLE 2018-01-11 10:57:43 -05:00
Isaac Connor b1e8963da9 add header to the login page 2018-01-11 10:57:29 -05:00
Isaac Connor 399907a9f0 Always load a base css style. Only show navbar contents when logged in, so we can use it on the login page 2018-01-11 10:57:07 -05:00
Isaac Connor 89ddb8cf5d Fix re for identifying event when using Medium storage scheme 2018-01-10 15:36:36 -05:00
Isaac Connor 493b063308 Merge branch 'fugro' into storageareas 2018-01-10 15:23:25 -05:00
Isaac Connor 5e0c954aff remove crap 2018-01-10 15:23:22 -05:00
Isaac Connor 5792021ee3 Merge branch 'storageareas' into fugro 2018-01-10 15:08:28 -05:00
Isaac Connor f246599704 Fix inserting default Server entry 2018-01-10 14:56:12 -05:00
Isaac Connor a4d3b32b8c Update all the event counts in the Monitors so that Triggers can be acurate 2018-01-10 14:40:42 -05:00
Isaac Connor f5b8461a54 Fix indexes on Groups_MOnitors 2018-01-10 14:33:31 -05:00
Isaac Connor eb2e78ccf7 Fix column names in triggers 2018-01-10 14:33:21 -05:00
Isaac Connor 64f9118e46 remove debug line 2018-01-10 13:47:03 -05:00
Isaac Connor a410706455 add a new daemon to do stat updates 2018-01-10 13:35:10 -05:00
Isaac Connor e605b48aa4 bump version to 1.31.20 2018-01-10 13:20:46 -05:00
Isaac Connor f14859d7d0 Add ZM_STATS_UPDATE_INTERVAL 2018-01-10 13:20:24 -05:00
Isaac Connor 8186a17a86 reduce frequency of Server updating 2018-01-10 13:20:09 -05:00
Isaac Connor 4442c571fb Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-10 13:15:20 -05:00
Isaac Connor 7d2becee21 add reload on HUP 2018-01-10 12:59:42 -05:00
Isaac Connor 156bdbd089 Add zmstats, zmaudit, zmtrigger flags to Server object listing/editing 2018-01-10 12:59:27 -05:00
Isaac Connor ae5f4c9d9c Add log re-init on HUP 2018-01-10 12:58:22 -05:00
Isaac Connor 4f6ab05e9e Remove stats updating from zmwatch.pl.in, where it shouldn't be 2018-01-10 12:58:04 -05:00
Isaac Connor cdbe1b9216 Only load SYs::MemInfo and Sys::CpuLoad if we are going to use them. Only start various services if they are turned on 2018-01-10 12:57:37 -05:00
Isaac Connor 146d56a6a0 fix missing } 2018-01-10 12:56:36 -05:00
Isaac Connor 4908ca1732 add the zmstats.pl, etc to Servers instead of Stroage 2018-01-10 12:56:01 -05:00
Isaac Connor 92bc6d6c20 put back the .pl 2018-01-10 12:55:42 -05:00
Isaac Connor c6ae965b9c add Events_Archived and update triggers to update Archived and Total Events 2018-01-10 12:27:42 -05:00
Isaac Connor acd12d234a add Events_Archived table. Add zmstats, zmaudit and zmtrigger settings to Servers table to tell if we should run the services or not. Fix a missing backtick at Scheme 2018-01-10 12:26:59 -05:00
Isaac Connor e7d56d6bbf Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-01-09 13:36:04 -08:00
Isaac Connor 1db4d7df83 start work on Events_(Hour|Day|Month|etc) tables for the event count data 2018-01-09 16:35:28 -05:00
Isaac Connor b420fde706 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-01-09 07:29:56 -08:00
Isaac Connor e28b6c8b7c When server is NULL, don't escape the NULL 2018-01-09 07:29:32 -08:00