Commit Graph

5702 Commits

Author SHA1 Message Date
Isaac Connor 417123019c fix crumbs 2019-10-23 09:52:36 -04:00
Isaac Connor 77118d55b2 add 4CIF aspect ratio padding. Fixes #2738 2019-10-23 09:50:49 -04:00
Isaac Connor d036613776 Fix Server() not returning a ServerObject if not found when ServerId is null or 0 2019-10-21 13:45:27 -04:00
Isaac Connor 91651652c7 Only report an error for not finding the server if ServerId had a value 2019-10-21 13:41:32 -04:00
Isaac Connor 12dfcae81f remove debug 2019-10-21 13:19:20 -04:00
Isaac Connor 3244c8ab5b spacing, quotes, remove debug 2019-10-21 13:18:09 -04:00
Isaac Connor 6a3fe1ef1f actually set date.timezone from ZM_TIMEZONE 2019-10-18 14:37:09 -04:00
Isaac Connor 1a417952c3 AutoStopTimeOut is part of Monitor, not Control 2019-10-18 14:19:25 -04:00
Isaac Connor 13b02284fe Merge branch 'master' into timezone_as_config 2019-10-18 13:58:22 -04:00
Isaac Connor a6a61b75b9 update ptz css in classic 2019-10-18 13:52:34 -04:00
Isaac Connor 524a39a224 changeCodec no longer needs to be passed this 2019-10-18 13:40:29 -04:00
Isaac Connor 1abdf25ad3
Merge pull request #2727 from externo6/align_filter_options
align with other filter options
2019-10-17 10:22:01 -04:00
externo6 9068cb1a19 align with other filter options 2019-10-17 10:17:22 +01:00
Isaac Connor fdf48c4123
Merge pull request #2726 from externo6/more-filter-options
More filter options
2019-10-16 10:15:58 -04:00
Isaac Connor ebebcad10d Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-10-16 10:13:31 -04:00
Isaac Connor 7146bdd59a IN order to allow specifying a monitor Id that has been deleted, use monitor->Id instead of mid to test for monitor existence 2019-10-16 10:08:30 -04:00
Isaac Connor d145adf9c6 set default for V4LCapturePerFrame to 1 instead of null. 2019-10-16 10:07:50 -04:00
Isaac Connor f25a823bc8 Fix event => zm_event 2019-10-16 08:53:40 -04:00
externo6 4b71bc75ea Change language to Contains / Not Contains and update perl filter. 2019-10-16 00:35:49 +01:00
Isaac Connor 8ee567442e UPdate replay, scale, codec dropdown onchanges 2019-10-15 15:04:14 -04:00
Isaac Connor ee1e12b938 Be more robust about returning a Server object when instantiating the default Storage area. 2019-10-11 17:29:47 -04:00
Isaac Connor 70396c5897 Don't warn about the spaces in the command 2019-10-09 13:10:43 -04:00
Isaac Connor c7f5673b47 Make filterFIelds global and give more info in error message 2019-10-09 10:30:40 -04:00
Isaac Connor b15f7ad47d handle ipv6 in Server->Hostname. Fixes #2713 2019-10-09 10:00:13 -04:00
Isaac Connor 1cf034ec5f fix inline js on the back/close button 2019-10-08 18:49:29 -04:00
Isaac Connor d1b086ddc6 fix cases of monitor->CanZoom to control->CanZoom 2019-10-08 18:49:11 -04:00
Isaac Connor c15e8eebb2 Make PTZ presets fill the entire window width and fix other visual problems with the buttons 2019-10-08 18:48:37 -04:00
Isaac Connor f3f972359b increase width of Zoom, White, Iris controls to fit wider button 2019-10-08 18:28:02 -04:00
Isaac Connor 4126554092 Move sendControlCommand out of includes/control_functions.php into Monitor.php. Make it smarted about talking to zmcontrol.pl. Fix sending the quit command 2019-10-08 18:07:33 -04:00
Isaac Connor 5040d5b075 remove extra ( 2019-10-05 16:56:05 -04:00
Isaac Connor b1496643eb fix js error in onvif probe 2019-10-03 17:31:10 -04:00
Isaac Connor 5384b9345a fix errors on centos 7 with the functions view 2019-10-03 17:30:52 -04:00
Isaac Connor 11fe748154 Sort control capabilities by Name instead of Id 2019-10-03 17:30:31 -04:00
Isaac Connor 7328eb1979 be more robust when sending commands to zmcontrol. Of no commands given don't bother. 2019-10-03 17:30:10 -04:00
Isaac Connor 17611f2e4b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-10-02 19:38:21 -04:00
Isaac Connor 769717b571
Merge pull request #2715 from connortechnology/fix_2620
Add delete from logs ajax capability.  Make the clear button use it. …
2019-10-02 16:43:08 -04:00
Isaac Connor 95615fee35 fix eslint 2019-10-02 16:42:50 -04:00
Isaac Connor 6b65e9a60c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-10-02 16:41:20 -04:00
Isaac Connor 7b93a445b8 Finish updating the linked Monitors dropdown 2019-10-02 15:42:56 -04:00
Isaac Connor e4b5052fb4 Add delete from logs ajax capability. Make the clear button use it. Fixes #2620 2019-10-02 15:39:04 -04:00
Isaac Connor d02aee64e4 Add setting of timezone to Options/Config instead of php.ini 2019-10-02 09:07:18 -04:00
Isaac Connor b4d5d92d86 Add some non standard resolutions available on some vivotek cameras 2019-09-30 15:06:32 -04:00
Isaac Connor 09efbfb4f1 Sort groups 2019-09-30 15:02:05 -04:00
Isaac Connor e37870d983 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-09-30 14:43:02 -04:00
Isaac Connor 85b16e89b7 Fix groups dropdown 2019-09-30 14:42:10 -04:00
Andrew Bauer 90b02beb94
fix eslint 2019-09-30 09:52:41 -05:00
Isaac Connor 3d6cab8360 Must force hash regeneration on login. Old hash may be from different user 2019-09-28 17:57:45 -04:00
Isaac Connor 7271151eb0 add some more aspect ratios 2019-09-28 15:16:25 -04:00
Isaac Connor 0c1635b3b8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-09-28 14:23:33 -04:00
Isaac Connor 393f0a369c Revamp timeline. Make it handle being full browser width. remove onclicks. 2019-09-28 14:23:23 -04:00