Commit Graph

2100 Commits

Author SHA1 Message Date
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 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 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 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
Isaac Connor b23a1d0955 Merge branch 'master' into storageareas 2019-08-07 15:51:21 -04:00
Isaac Connor fb414b3f19 remove debug statements 2019-08-07 15:34:45 -04:00
Isaac Connor d4b59211cd Merge branch 'master' into storageareas 2019-08-07 11:21:19 -04:00
Isaac Connor 962049fa31 Merge branch 'master' into filter_add_copy 2019-08-06 20:17:21 -04:00
Isaac Connor 7e6b0058d2 Update Zone buttons. Fix double submit. Fixes #2671 2019-08-02 08:04:38 -04:00
Isaac Connor 8167ff2143 fix eslint 2019-07-26 12:28:02 -04:00
Isaac Connor 547e80b1a9
Fix download and export button from events list. Fixes #2668 (#2670) 2019-07-24 12:31:43 -04:00
Isaac Connor a6a2239e5b
Fixes #2579 by putting the event Id into an attribute of the delete button. Also uses a button instead of a link. Also only does parent refresh if parent exists (#2662) 2019-07-24 11:39:21 -04:00
Isaac Connor 39262d55f5 Also show secondary storage area when viewing event 2019-07-24 11:26:07 -04:00
Isaac Connor 2d46f2adab add Secondary Storage Area options. 2019-07-24 11:25:51 -04:00
Isaac Connor 1a0beab703 add Secondary Storage Area options. Storage array is now an array of Objects so use the Name key 2019-07-24 11:25:38 -04:00
Isaac Connor 0e040fc2fc Add click_autocopy function 2019-07-23 10:00:05 -04:00
Isaac Connor 346933126d Update filter view to use Filter::find 2019-07-23 09:59:49 -04:00
Isaac Connor df8c46f0f0 Fix #2657 2019-07-08 14:22:46 -04:00
Isaac Connor da5e8d19b8 Fix #2656 2019-07-07 17:54:45 -04:00
Isaac Connor b84e3499f4 Implement code to auto-load monitor status info if not already loaded. Check for Connected instead of Capturing in watch to display warning message 2019-07-07 17:25:49 -04:00
Isaac Connor 4b41655dc5 fix 2019-07-07 16:10:53 -04:00
Isaac Connor 3c1cd1e750 rename var from nevents to nFrames because that's what they are. Fix an error when page=0 2019-07-07 16:03:54 -04:00
Isaac Connor 2470c09b20 Honour thumbnail width when bringing up frames popup for frames and alarm frames 2019-07-03 17:19:10 -04:00
Isaac Connor 268bc2264b Merge branch 'storageareas' 2019-07-02 10:19:03 -04:00
Isaac Connor 1161c251fc Add a warning when the monitor is not capturing in live view 2019-06-28 10:28:53 -04:00
Isaac Connor 305a954ee2 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2019-06-25 22:20:19 -04:00
Isaac Connor 46f3aabc25 Merge branch 'hwdecode' into storageareas 2019-06-25 15:35:56 -04:00
Isaac Connor a28f17653f Add DecoderHWAccel fields to Monitor 2019-06-25 15:34:45 -04:00
Tom Hodder 46c19c7efb fix for zone overlay scaling issues in montage (#2643)
* remove extra px in svg tag

* add js method to track liveStream img size for zones

* switch to using SVG scaling to deal with zone polygons

* update jsdoc for eslint

* fix blank lines eslint issue
2019-06-24 11:45:40 -04:00
Isaac Connor 44e4d93445 Merge branch 'master' into storageareas 2019-06-24 11:35:36 -04:00
Isaac Connor 6ed0074077
End continuous events on alarm (#2644)
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it

* Spacing, google code style and tabs to spaces

* add update script to add MinSectionLength

* Add min_section_length to enforce a minimum event length when closing continuous events on alarm
2019-06-24 11:29:00 -04:00
Isaac Connor 85b9b045cc Copy Profile Token to ControlDevice for use with Netcat PTZ script 2019-06-21 12:42:26 -04:00
Isaac Connor 77eb15ff17 fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns 2019-06-19 09:22:21 -04:00
Tom Hodder 70a91c7069 WIP: Add pagination to frames.php in classic (#2618)
* add pagination to the frames.php results

* remove commented code, fix view all paging

* removing debugging logging statements

* default frames paging to on
2019-06-19 09:22:21 -04:00
Isaac Connor 199e8182be Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-06-19 08:36:48 -04:00