Commit Graph

2679 Commits

Author SHA1 Message Date
Isaac Connor f3f972359b increase width of Zoom, White, Iris controls to fit wider button 2019-10-08 18:28:02 -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 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 b4d5d92d86 Add some non standard resolutions available on some vivotek cameras 2019-09-30 15:06:32 -04:00
Andrew Bauer 90b02beb94
fix eslint 2019-09-30 09:52:41 -05:00
Isaac Connor 7271151eb0 add some more aspect ratios 2019-09-28 15:16:25 -04:00
Isaac Connor 393f0a369c Revamp timeline. Make it handle being full browser width. remove onclicks. 2019-09-28 14:23:23 -04:00
Isaac Connor deef948964 Allow anyone to change their skin 2019-09-28 12:58:17 -04:00
Isaac Connor ec9e94b99d Don't add checkboxes if can't edit groups 2019-09-28 12:58:01 -04:00
Isaac Connor 80e3922165 add backWindow function to handle back buttons 2019-09-28 12:57:43 -04:00
Isaac Connor ebcacaa660 Use material icons for buttons 2019-09-26 16:26:37 -04:00
Isaac Connor fdaee75310 Use material icons for buttons. Hide the stop button because it does nothing. 2019-09-26 16:26:18 -04:00
Isaac Connor e4265bd075 spaces 2019-09-26 16:13:49 -04:00
Isaac Connor 2b017f782b Fix missing eid= from View All/View Pages links 2019-09-25 10:35:41 -04:00
Isaac Connor bcb8389923 spaces 2019-09-25 10:16:27 -04:00
Isaac Connor b936fbac6a Don't import Monitor.php unless we need to 2019-09-25 10:16:16 -04:00
Isaac Connor ca40e760f7 get global cspNonce 2019-09-25 10:15:32 -04:00
Isaac Connor 54dec069cd correct quotes and use a button on loging page 2019-09-25 10:15:12 -04:00
Isaac Connor 1b653e7e79 Add warnings for when SaveJPEGs and VideoWriter are both set to disabled 2019-09-25 10:14:41 -04:00
Isaac Connor c7d7d45380 Remove :'s, they can be added using css if desired 2019-09-23 11:49:39 -04:00
Isaac Connor 9a94ce6e41 remove debug 2019-09-23 10:22:25 -04:00
Isaac Connor 8d95b2f5f8 Don't select Layout when changing size in montage 2019-09-22 14:22:24 -04:00
Isaac Connor 7b9eaf42b8 Fix selecting group from groups listing under monitor name. Fixes #2711 2019-09-22 12:03:34 -04:00
Isaac Connor d7810bf9b3 fix eslint 2019-09-20 14:16:37 -04:00
Isaac Connor 6c39fd133d fix eslint 2019-09-20 10:44:38 -04:00
Isaac Connor 5d0b4942d6 remove debug 2019-09-20 10:37:48 -04:00
Isaac Connor 0d19b0dc85 Use a subselect instead of inner join because the inner join won't return monitors that don't have a group 2019-09-20 10:37:19 -04:00
Isaac Connor a8cbe7d10d Turn off debug 2019-09-20 10:36:50 -04:00
Isaac Connor d4435368bc fix spacing between presets and home/set 2019-09-19 14:57:48 -04:00
Isaac Connor b05ecd881e add onchange to scale 2019-09-19 14:57:21 -04:00
Isaac Connor 2da9edf0ff add onchange to scale 2019-09-19 14:57:17 -04:00
Isaac Connor 14e625b775 Set width of dimensions 2019-09-19 14:56:55 -04:00
Isaac Connor b9b52c964e Upgrade monitor saving and viewing 2019-09-19 14:56:16 -04:00
Isaac Connor 4c206c2e9a Upgrade Control Object to extend ZM\Object. Add commands function from skin specific control functions 2019-09-19 14:55:17 -04:00
Isaac Connor d5ee73a9ee use CaptureResolution instead of CaptureDimensions because it is already in language 2019-09-19 10:50:20 -04:00
Isaac Connor 1bd70319a9 Add a dimensions dropdown to ease entering monitor dimensions 2019-09-19 10:48:25 -04:00
Isaac Connor b3b7ec660b Add a test for the built-in layouts. Can't edit them. 2019-09-18 11:19:28 -04:00
Isaac Connor 9e8c17dfaf Merge branch 'master' into tolland-remove-extra-px 2019-09-18 11:17:50 -04:00
Isaac Connor 0eb1fff5b5 remove unused view=image-ffmpeg 2019-09-18 11:16:49 -04:00
Isaac Connor f509b4c9d1 spacing 2019-09-18 11:10:40 -04:00
Isaac Connor ce1823bd29 spacing and fix saving 2019-09-17 12:46:11 -04:00
Isaac Connor bcaabf4cf2 update buttons 2019-09-17 12:09:36 -04:00