Commit Graph

2749 Commits

Author SHA1 Message Date
Isaac Connor 54c11bc0d1 define monitor_options as an empty array instead of php implicitly dealing with it 2019-11-01 13:42:01 -04:00
Isaac Connor a20517a6db spacing 2019-11-01 13:41:37 -04:00
Isaac Connor 18c13c4bad Make chosen dropdowns 100% width on monitor edit 2019-11-01 13:40:55 -04:00
Isaac Connor 9a3bee28d2 add logging and handling of oninput and oninput-this 2019-11-01 13:38:09 -04:00
Isaac Connor 3653ad5ce3 update group editing, solving inline javascript problems and removing cruft 2019-11-01 13:37:52 -04:00
Isaac Connor 6ae220f756 improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript 2019-10-29 18:06:32 -04:00
Isaac Connor daf71aa492 improvements to layout on zones and zone 2019-10-29 18:06:03 -04:00
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 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 fdf48c4123
Merge pull request #2726 from externo6/more-filter-options
More filter options
2019-10-16 10:15:58 -04:00
Isaac Connor f25a823bc8 Fix event => zm_event 2019-10-16 08:53:40 -04:00
Isaac Connor 8ee567442e UPdate replay, scale, codec dropdown onchanges 2019-10-15 15:04:14 -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 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 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
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
externo6 7479d3f1f1 Add LIKE and NOT LIKE to filter options
This is useful for filtering notes.
EG filtering detected objects from zmeventnofification;
WHERE notes LIKE %detect%
WHERE notes NOT LIKE %car%
2019-09-28 13:03:16 +01: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
Isaac Connor f0cfd674c1 Cleanup options skins tab. Setting the values happens in index.php. Use global and 2019-09-17 12:06:54 -04:00
Isaac Connor d141632256 general clean of onvif probe view. Use buttons instead of inputs and use data-on-change-this instead of inline js. Also rename username and password to Username and Password to not conflict with authentication to ZM ui. 2019-09-11 09:18:03 -04:00
Isaac Connor bce1a48b66 Fix another Monitorid. Fixes #2699 2019-09-05 10:31:22 -04:00
Isaac Connor f568e0da30 Fix event->id() to event->Id() 2019-09-04 10:11:16 -04:00
Isaac Connor 16f0ad4f59 Fix Monitorid => MonitorId 2019-09-03 12:55:45 -04:00
Isaac Connor 99a2ddba63 Add listing of Secondary Storage area in events list 2019-08-29 11:27:06 -04:00
Isaac Connor c6dd3ffbec tabs to spaces 2019-08-28 09:19:09 -04:00
Isaac Connor 91ef4f5932 x264 encode works on arm now, so let people choose it 2019-08-28 08:51:42 -04:00
Isaac Connor 8043ba8092 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-27 16:49:12 -04:00
Paulius Gedrikas 9b3fecd7a0 Fix iOS autocapitalizing username field on login (#2687)
I propose removing the auto-capitalization from the username field for Safari under iOS by adding autocapitalize="none" to the username form field. Usernames rarely start with a capital letter, so I think this would be a usability improvement for users logging in through iPhones or iPads.

Having to login to ZM under iOS, I've been frustrated at the need to always press on the Caps Lock key on the virtual keyboard to disable the capitalization of the first letter. This is because iOS auto capitalized non-password and non-email HTML form fields. ZM is also case sensitive, so "Admin" will not work if the main user is "admin".
2019-08-27 16:49:03 -04:00
Isaac Connor dfb65d23bf Fix eslint warnings 2019-08-27 16:48:42 -04:00
Isaac Connor 41fb11d776 Fix Arched lacking () so not working 2019-08-27 15:19:38 -04:00
Isaac Connor d7d2c140a0 Use index to server hosting storage where event is saved to talk to zms 2019-08-27 15:19:18 -04:00
Isaac Connor cd883e23b8 Extend inputs to full width on storage popup 2019-08-26 20:45:20 -04:00
Isaac Connor f01bedb33e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-26 18:49:12 -04:00
Isaac Connor 231c9c3902 move executeFilter to Filter->execute. If no changes have been made, don't make a tempfilter. 2019-08-26 18:48:34 -04:00
Isaac Connor 5527685162 Merge branch 'storageareas' 2019-08-26 16:22:10 -04:00
Isaac Connor 292b530f99 Allow montage review maxdatetime to be less than minDateTime. This allows us to set it first so that the reload does kill us 2019-08-26 16:20:23 -04:00
Isaac Connor 7768d39eb9 Add auth to streamParms so that multi-server event viewing works 2019-08-26 16:19:44 -04:00
Isaac Connor c4c6935c6e Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2019-08-23 18:17:50 -04:00
Isaac Connor 73ba699dc4 Sort filter fields dropdown 2019-08-23 18:17:45 -04:00
Isaac Connor e707bd8e72 correct getting frame_id so we get images instead of nodata 2019-08-23 17:59:29 -04:00
Isaac Connor 7598654740 add auth hash to ajax streams, and use monitorUrl instead of thisUrl to talk to zms 2019-08-23 17:58:40 -04:00
Isaac Connor 61926d3b85 Only parse the filter if it is valid. Remove unused filterQuery var 2019-08-20 10:03:44 -04:00
Isaac Connor ca0b583007 Use material icons for sort because they look nicer 2019-08-19 08:59:15 -04:00
Isaac Connor 239c68dd7f add .. to fix #2686 2019-08-19 08:58:52 -04:00
Isaac Connor 4140d51e9f database.php cleanup. remove dbFetchMonitor and dbFetchGroup. Their usage has been replaced with the Object::find_one usage. Also more quoting of table and colume names to fix #2659 2019-08-13 11:45:50 -04:00
Isaac Connor 38a09bbd18 Don't auto-add default storage area to header. If someone wants to see it's space in the header they can add it to storage areas 2019-08-08 15:34:07 -04:00
Isaac Connor 702cb65d2a Merge branch 'storageareas' 2019-08-08 13:38:36 -04:00
Isaac Connor 45b970fb09 fix spacing 2019-08-08 13:34:28 -04:00