Commit Graph

4001 Commits

Author SHA1 Message Date
Isaac e364a541d4 Whitespace and use ZM_DIR_EXPORT instead of ZM_DIR_TMP 2018-01-24 22:21:43 +01:00
Isaac de08e3114e more and less debug 2018-01-23 18:16:37 +01:00
Isaac 8bd1e4cec6 Only show groups filter if there are groups 2018-01-23 18:15:59 +01:00
Isaac 1b23f7b564 turn off debug 2018-01-23 17:34:49 +01:00
Isaac b22f20cb93 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-23 15:40:07 +01:00
Isaac Connor 8fe0e1bdc0 fix Debug => Logger::Debug 2018-01-22 15:58:01 -05:00
Isaac 13bfbe4f4b Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-22 20:07:11 +01:00
Isaac Connor 8a27ea3a04 Always populate the monitorNames object, and check for duplicate names when saving an existing Monitor as well as new monitors 2018-01-22 11:42:52 -05:00
Isaac Connor 97595051ce whitespace 2018-01-22 11:42:19 -05:00
Isaac Connor 924fa80ea6 When renaming a monitor, take change of storage area into account when creating dirs and symlinks 2018-01-22 11:42:07 -05:00
Isaac c04fcfb239 Need a few more pixels of width to fit all preset buttons 2018-01-22 15:50:18 +01:00
Isaac 06c9266c62 use snapshot.jpg more 2018-01-22 03:27:01 +01:00
Isaac Connor 181a94de82 test for existence of port in url_parts 2018-01-21 11:10:34 -05:00
Isaac Connor bd2da456f4 handle non-multi-server case when restarting monitors via API 2018-01-19 21:09:33 -05:00
Isaac Connor e26747b5cc show port when it's not the standard port 2018-01-19 12:15:26 -05: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 ace66cf977 show port in source column 2018-01-17 13:33:22 -08:00
Isaac Connor 212bfd4a2c add Monitor to info shown on event 2018-01-17 12:20:15 -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
Isaac Connor fe7c54bc26 Fix Debug 2018-01-16 17:54:37 -05:00
Isaac Connor 27ebf1a4aa Comment out debug code 2018-01-16 14:02:04 -05:00
Isaac Connor a8dde207e1 Warning should be a debug 2018-01-16 12:33:50 -05:00
Isaac Connor 9f42871c86 Fix Zone Triggers, bump version 2018-01-16 11:49:17 -05:00
Isaac Connor 004fdbad9b We don't need to update ZoneCount manually anymore 2018-01-16 09:31:23 -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 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 3c55557c77 Handle to val in a filter term 2018-01-11 22:53:53 +01: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 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 5792021ee3 Merge branch 'storageareas' into fugro 2018-01-10 15:08:28 -05:00
Isaac Connor 64f9118e46 remove debug line 2018-01-10 13:47:03 -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 156bdbd089 Add zmstats, zmaudit, zmtrigger flags to Server object listing/editing 2018-01-10 12:59:27 -05:00
Isaac Connor 4047d0ffc8 add No Server as an option is Server filter 2018-01-09 07:13:03 -08:00
Isaac Connor 10133073de Check for SaveJPEGs being set to snapshot instead of hitting the fs to check for a snapshot file 2018-01-04 12:31:20 -05:00
Isaac Connor a33cba9989 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-01-02 09:17:16 -08:00
Isaac Connor 1b1b93f811 use CakePHP-Enum-Behavior to add support for ENUMs to the Monitor model. This should fix #48 2018-01-01 14:43:02 -05:00
Isaac Connor 109a24ed4d Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-01-01 10:37:24 -08:00