Commit Graph

14376 Commits

Author SHA1 Message Date
Isaac Connor f8e54ba6e3 spacing, quotes 2020-01-10 16:41:22 -05:00
Isaac Connor f61f6eaf7d remove line cutnpasted erroneously 2020-01-10 12:45:47 -05:00
Isaac Connor d433590f74 use find_one in stead of new to use Cached Server 2020-01-10 12:45:30 -05:00
Isaac Connor ef4ecd40fb Set defaults before saving Objects 2020-01-10 12:44:59 -05:00
Andrew Bauer f13a7199e1
fix eslint 2020-01-07 21:53:55 -06:00
Isaac Connor c64de372a7 when auth_hash changes, update various CmdParms 2020-01-07 17:08:57 -05:00
Isaac Connor 0571909d05 add remote_IP to log entries on php side 2020-01-07 17:08:29 -05:00
Isaac Connor 1865df3fe0 remove some debug, add some parenthesis to ensure logic works as intended 2020-01-07 17:08:07 -05:00
Isaac Connor c0443f694a I think we need .buildinfo as well 2020-01-07 12:24:39 -05:00
Isaac Connor 971d62f60d encode the telemetry to utf-8 before sending. Fixes #2800 2020-01-07 12:09:34 -05:00
Isaac Connor c3f8d9c364 add php5-json as a dependency 2020-01-07 12:08:08 -05:00
Isaac Connor b85cf7d8a1 include error message when complaining about failing to create the hwaccell device 2020-01-07 11:03:45 -05:00
Isaac Connor 61bc0ddd0a add missing t and merge some lines 2020-01-07 11:01:53 -05:00
Isaac Connor 2f1b725ee4 quote SQL for mysql8 2020-01-07 11:01:02 -05:00
Isaac Connor 862e4f83eb Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-05 17:34:49 -05:00
Isaac Connor 7535769e4b controlcap needs to be larger 2020-01-05 17:34:40 -05:00
Isaac Connor 71581831b5 fix problem with the clone button material icon. Apparently file_copy doesn't work, so use content_copy instead despite it not being listed in the material icons 2020-01-05 17:34:27 -05:00
Isaac Connor 6ac26ec1aa quotes 2020-01-05 17:33:53 -05:00
Isaac Connor c3641df531 spaces 2020-01-05 17:30:06 -05:00
Isaac Connor fd633a2175 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-01-05 17:28:50 -05:00
Isaac Connor 05ac82b0bb Handle failure to init hwdevice when trying to use hwaccel. 2020-01-05 17:27:45 -05:00
Andrew Bauer 2956e5e156 use dnf rather than yum for newer redhat distros 2020-01-05 14:30:33 -06:00
Isaac Connor 00f8a450de spaces and quotes 2020-01-05 14:59:25 -05:00
Andrew Bauer 0fb806d9d7
Allow aarch64 as a valid build architecture 2020-01-04 15:30:32 -06:00
Isaac Connor 7fdf6165d5 Fix case in var name 2020-01-03 17:08:11 -05:00
Isaac Connor c8e39e2418 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-03 16:35:15 -05:00
Isaac Connor e951b0af1c add code to set default value for checkboxes 2020-01-03 16:35:04 -05:00
Isaac Connor 0a495395b0 Restore Gain tab 2020-01-03 16:34:46 -05:00
Isaac Connor f572c4092a add checks for Zoom, Focus, White, Iris movement types 2020-01-03 15:58:57 -05:00
Isaac Connor 158e26bb25 split long lines 2020-01-03 15:58:02 -05:00
Isaac Connor c4aaa33bea add widths for number inputs on controlcap view 2020-01-03 15:57:51 -05:00
Isaac Connor 0b3776dbf0 change text inputs to number inputs, cleanups 2020-01-03 15:57:29 -05:00
Isaac Connor 89844f72f4
Merge pull request #2790 from pliablepixels/jwt-token-duration
fix JWT access token always being 1 hr
2020-01-02 17:22:37 -05:00
Isaac Connor d42e9beddc Add warnings when the type of movement is not selected 2020-01-02 17:03:52 -05:00
Isaac Connor e9815bf9c7 add ZM Namespace to Error calls 2020-01-02 16:54:50 -05:00
Isaac Connor 06f846c88b add php-json to depends 2020-01-02 16:52:09 -05:00
Isaac Connor 3cfc1a0a6d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-02 16:45:39 -05:00
Isaac Connor 1d24e022bb Add realm detection 2020-01-02 16:45:27 -05:00
Isaac Connor 9d57be4c9e google code style, remove redundant code matching parent. Don't re-instantiate UA. 2020-01-02 16:24:43 -05:00
Pliable Pixels 399508b211 fix JWT access token always being 1 hr 2020-01-02 10:25:48 -05:00
Isaac Connor 60d45d967f test for existence of selected checkboxes in post data because if none are selected, the array won't exist 2020-01-02 10:17:07 -05:00
Andrew Bauer 98f7fb63b9 fix eslint errors 2019-12-31 19:24:51 -06:00
Isaac Connor f5776f8d80
Merge pull request #2789 from connortechnology/random_web_colour
Random web colour
2019-12-31 19:15:50 -05:00
Isaac Connor a7b23f5c39 add esnotification to log lines to ignore in logcheck 2019-12-31 19:12:31 -05:00
Isaac Connor 6a39893c1d include i elements in data-on-click 2019-12-31 19:11:14 -05:00
Isaac Connor 714d304528 Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation 2019-12-31 19:10:29 -05:00
Isaac Connor 66ff602941 change default for file logging to be debug, which results in INF unless debug messages are turned on. Also clear LOG_DEBUG_FILE because it is designed to be a temporary debugging tool, and isn't all that useful at that. 2019-12-31 12:50:03 -05:00
Isaac Connor 8913341140 Bump default for WATCH_MAX_DELAY to 45 seconds. Many cameras take even over 30 seconds to obtain the first image. I find 45 to be a reasonable default 2019-12-31 12:44:41 -05:00
Isaac Connor 77cfb7c190 fix spacing 2019-12-31 12:42:49 -05:00
Isaac Connor f27b4ec939 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-12-30 22:19:29 -05:00