e9815bf9c7
add ZM Namespace to Error calls
2020-01-02 16:54:50 -05:00
06f846c88b
add php-json to depends
2020-01-02 16:52:09 -05:00
3cfc1a0a6d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-02 16:45:39 -05:00
1d24e022bb
Add realm detection
2020-01-02 16:45:27 -05:00
9d57be4c9e
google code style, remove redundant code matching parent. Don't re-instantiate UA.
2020-01-02 16:24:43 -05:00
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
98f7fb63b9
fix eslint errors
2019-12-31 19:24:51 -06:00
f5776f8d80
Merge pull request #2789 from connortechnology/random_web_colour
...
Random web colour
2019-12-31 19:15:50 -05:00
a7b23f5c39
add esnotification to log lines to ignore in logcheck
2019-12-31 19:12:31 -05:00
6a39893c1d
include i elements in data-on-click
2019-12-31 19:11:14 -05:00
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
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
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
77cfb7c190
fix spacing
2019-12-31 12:42:49 -05:00
f27b4ec939
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-30 22:19:29 -05:00
2c76c12664
Fix export to include files when using DEEP scheme. Also make it more efficient
2019-12-30 22:18:55 -05:00
ec76ffe720
update redhat README's
2019-12-30 08:53:34 -06:00
8796f00973
move raspbian builds to native arm hardware
...
Build time was just under 40 minutes in Travis. Moving this build to remote arm build host for quicker build time.
2019-12-30 07:27:30 -06:00
e039b136c0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-29 16:46:45 -05:00
f065daf940
spacing, move some variables deeper in scope, merge fprintf calls
2019-12-29 16:46:30 -05:00
e68cd02dca
Merge pull request #2788 from anon8675309/fix_quotes
...
Fixed unquoted variable which was failing to correctly detect error case
2019-12-29 16:33:48 -05:00
ce7b62c825
Fixed unquoted variable which was failing to correctly detect error case
...
This was discovered when there was a DNS failure (it's always DNS) and
it caused a syntax error on line 178. I changed it to use -z to check
for a zero length string, as suggested by the man page. Putting $VERSION
in double quotes would also be a valid fix.
Here's what the script looks like when it fails:
./do_debian_package.sh --snapshot=stable --type=local --interactive=no
Doing local build
Defaulting to bionic for distribution
Defaulting to ZoneMinder upstream git
fatal: not a git repository (or any of the parent directories): .git
fatal: not a git repository (or any of the parent directories): .git
Latest stable branch is
git clone https://github.com/ZoneMinder/ZoneMinder.git ZoneMinder_zoneminder_release
Cloning into 'ZoneMinder_zoneminder_release'...
fatal: unable to access 'https://github.com/ZoneMinder/ZoneMinder.git/ ': Could not resolve host: github.com
./do_debian_package.sh: line 172: cd: ZoneMinder_zoneminder_release: No such file or directory
fatal: not a git repository (or any of the parent directories): .git
cat: ZoneMinder_zoneminder_release/version: No such file or directory
./do_debian_package.sh: line 178: [: ==: unary operator expected
Doing local release zoneminder_
mv: cannot stat 'ZoneMinder_zoneminder_release': No such file or directory
Error status code is: 0
Setting up build dir failed.
2019-12-29 14:13:49 -06:00
b5e3dbd415
put back 32bit alignment with a comment as to why
2019-12-29 12:52:34 -05:00
2581b86195
add more content to the error message when can't sws_scale.
...
Also fix problem when using 32bit on arm instead of 24bit, apparently 0 is a valid return result from sws_scale.
Also change the alignment in av_image_fill_arrays. At some point we cahnged it to 32bit aligned, but in 1.32 we didn't align at all. Not sure if it matters
.
2019-12-29 12:44:59 -05:00
bbcd1846e7
Fix hang caused by using %d instead of PRIu64 in formatting string
2019-12-29 12:44:30 -05:00
2301103da5
use small, non-zero values, for image buffer & pre & post buffers
2019-12-28 09:49:42 -06:00
ce3691be85
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-28 08:37:40 -06:00
00cedc92d2
fix typo
2019-12-28 08:37:16 -06:00
0aa82a74ec
remove support for f29 builds
2019-12-27 17:13:13 -06:00
276428be59
el8 needs php-json
2019-12-27 16:39:24 -06:00
77f026a389
exclude external-repo.noarch.rpm during deployments
2019-12-27 09:12:49 -06:00
28a6e71992
deploy raspbian builds to debian target folder
2019-12-27 09:04:02 -06:00
3bc1543f9e
build rpms on every commit
2019-12-26 19:36:33 -06:00
845f35fe00
Fix cases of check before creating dirs. Add chmod so they are only readable by web user. Fix MonitorName => Monitor->Name()
2019-12-26 15:57:25 -05:00
66ec110b02
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-26 15:21:33 -05:00
1977e48ddd
DefaultScale is a member of the Monitor, not the event
2019-12-26 15:21:27 -05:00
4426546a56
Merge pull request #2785 from connortechnology/fix_2784
...
Add empty array value for terms when there isn't any
2019-12-26 11:23:52 -05:00
9e43e06a55
Add empty array value for terms when there isn't any to get rid of warning when loading all events
2019-12-26 11:22:42 -05:00
5bd353928e
update rsync text
2019-12-25 09:05:50 -06:00
aa0dc4729b
exit immediately if deploy host does not respond
2019-12-25 08:45:10 -06:00
73aba586d4
move eslint into env matrix + other build tweaks
2019-12-25 08:41:53 -06:00
69abf2d314
Remove i386 bionic builds
...
The i386 Bionic container is not ready. This build will be re-enabled when the container is done.
2019-12-24 14:26:30 -06:00
0f7fbc8c79
use my el-8 container
...
packpack el-8 container contains a dnf related bug, which causes el8 builds to fail. Switch to a container I built with a workaround.
2019-12-24 09:53:56 -06:00
635988f0cc
use quotes for correctness
2019-12-23 17:13:38 -06:00
f3116589e3
replace sshfs with rsync for all deployments
2019-12-23 17:08:57 -06:00
8025f8d6eb
add support for fedora 31
2019-12-23 14:49:25 -06:00
76b54a468f
use left join instead of inner join when listing monitors
2019-12-22 18:43:53 -05:00
42a724891b
spacing
2019-12-20 16:11:38 -05:00
63d20a1514
Move hidden inputs to top of form
2019-12-20 16:11:24 -05:00
5a45835006
break up long lines
2019-12-20 16:11:10 -05:00
Isaac Connor
Andrew Bauer
Isaac Connor
Andrew Bauer
adam