Commit Graph

13887 Commits

Author SHA1 Message Date
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
Isaac Connor a2861c1361 remove errant ( 2019-09-28 14:22:40 -04:00
Isaac Connor ae7644370f quotes 2019-09-28 14:14:27 -04:00
Isaac Connor c24fc6c21f Set Delta to 0 to avoid errors 2019-09-28 14:10:11 -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 30b5612691 fix case of sql 2019-09-28 12:57:00 -04:00
Isaac Connor f3f253c083 Query was renamed to Query_json 2019-09-28 11:55:28 -04:00
Isaac Connor 411807c7b0 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-09-28 10:27:38 -04:00
Isaac Connor 7a3134ae5e Fix restart login in functions. Only start zmc if function is not None and start zma if it isn't None or NoDect. Even if disabled, we still run zma so that we can send it a signal to enable motion detection. 2019-09-28 10:26:50 -04:00
Isaac Connor 8940ca420c Use iconzm docker for disco 2019-09-26 17:23:58 -04:00
Isaac Connor ebcacaa660 Use material icons for buttons 2019-09-26 16:26:37 -04:00
Isaac Connor b1bcfe8a9b fix backtrace 2019-09-26 16:26:28 -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 555f3e9c0d Fix missing semi colon in Content-Security-Policy-Report-Only 2019-09-26 13:52:27 -04:00
Isaac Connor 492be7cc33 make last_zoom last_scale last_x and last_y members of the StreamBase object instead of static vars so that we can access them in monitorStream 2019-09-26 13:51:49 -04:00
Isaac Connor b787682fa9 Fix play from pause when not buffering. When change of zoom, send two paused images so that response is instant. Fix some misplaced line feeds. 2019-09-26 13:51:13 -04:00
Isaac Connor 675db328e7 enable bionic iconzm docket repo 2019-09-25 12:00:32 -04:00
Isaac Connor 1dda79af46 remove debug 2019-09-25 12:00:00 -04:00
Isaac Connor 84d68f549f enable iconzm docker for stretch 2019-09-25 10:36:12 -04:00
Isaac Connor 4deea4c6ab code doc 2019-09-25 10:35:57 -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 fe893a4a01 Add report-uri to out Content-Security-Policy-Report-Only header 2019-09-25 10:16:02 -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 5c80e098c5 Only save Group changes if there were changes 2019-09-25 10:14:12 -04:00
Isaac Connor 475432449f Add default values for Status record 2019-09-25 10:13:56 -04:00
Isaac Connor afd10e49d6 spaces, quotes extra braces 2019-09-25 10:13:32 -04:00
Isaac Connor 80710e6551 use @PERL_EXECUTABLE@ 2019-09-24 10:12:44 -04:00
Isaac Connor d4a8c96ede Build and deploy packages for every commit for debian/ubuntu/raspbian 2019-09-23 13:10:14 -04:00
Isaac Connor 766a59884d Don't hard code perl path. Use PERL_EXECUTABLE cmake var 2019-09-23 12:54:27 -04:00
Isaac Connor d16d77d6b3 quotes and spacing 2019-09-23 12:39:24 -04:00
Isaac Connor dfa51c4e3f update of zmtrack.pl. include id in logfile. 2019-09-23 12:38:58 -04:00
Isaac Connor bc33c0bcb5 make zmcontrol log to zmcontrol_id.log 2019-09-23 12:21:59 -04:00
Isaac Connor a05c513643 Revert change breaking multiport when servers not defined. 2019-09-23 12:03:19 -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 538478ff1c Need to -1 on the dimensions when comparing to points as they are 0-based 2019-09-23 11:48:58 -04:00
Isaac Connor 1dd09923eb Add special case for just rotating the monitor dimensions and add out of bounds check for zone points 2019-09-23 11:42:49 -04:00
Isaac Connor 15a1b19b42 spaces 2019-09-23 10:53:21 -04:00
Isaac Connor 83e477e6be CaptureAndRecord in remote camera rtsp doesn't work. Remove it. 2019-09-23 10:52:57 -04:00
Isaac Connor 9a94ce6e41 remove debug 2019-09-23 10:22:25 -04:00