Commit Graph

19130 Commits

Author SHA1 Message Date
Isaac Connor 80800785be Fix getting border width on firefox. Need to specify which border. Went a little further and split x and y axis borders in the maxfit2. Fixes #3249 2021-05-25 13:15:04 -04:00
Isaac Connor 799a0ed7ba
Merge pull request #3254 from bestlong/add-lang
web ui add lang (Chinese Traditional)
2021-05-25 13:12:34 -04:00
Isaac Connor 82c7474786
Merge pull request #3257 from Carbenium/ffmpeg-stretch
FfmpegCamera/Videostore: Disable hwaccel for ffmpeg found in Debian Stretch
2021-05-25 13:12:17 -04:00
Isaac Connor a266388898
Merge pull request #3255 from anon8675309/gitlab-ci
Enable gitlab CI to build debian packages
2021-05-25 13:08:58 -04:00
Isaac Connor 6e70eb5963
Merge pull request #3259 from gerazo/master
Updated Hungarian translation
2021-05-25 13:08:00 -04:00
Zoltan Gera 714dd0aa9f Updated Hungarian translation 2021-05-25 18:15:40 +02:00
Isaac Connor cf03bb9548 Merge branch 'release-1.36' 2021-05-25 11:34:11 -04:00
Isaac Connor 9e64b912a8 Add samesite when setting cookie for skin and css 2021-05-25 11:33:28 -04:00
Isaac Connor d59118fc47 Add redirect so that Yes I'd like to donate now goes to the zoneminder /donate website. This used to happen in javascript but got removed when it was turned into a modal. 2021-05-25 11:33:12 -04:00
Peter Keresztes Schmidt e659543d0a Logger: Fix DB log messages not being populated
We need to `resize` the buffer string since `reserve` does not guarantee that the buffer is
actually available.

Follow-up on 298415fff3
2021-05-25 11:29:32 -04:00
Isaac Connor 6a9ed9c457 Use data-onclick instead of data-on-click-this. 2021-05-25 11:22:43 -04:00
Peter Keresztes Schmidt 6b478484bd CI: Add workflow for Debian Bullseye 2021-05-25 07:41:39 +02:00
Peter Keresztes Schmidt d413f3c78f FfmpegCamera/Videostore: Disable hwaccel for ffmpeg found in Debian Stretch
The av_hwdevice_* API is not complete in 3.2. Enable hwaccel from 3.4 onwards.
2021-05-24 23:20:30 +02:00
Peter Keresztes Schmidt 8a8dc48206 CI: Add CI workflow for Debian Stretch 2021-05-24 22:03:43 +02:00
Peter Keresztes Schmidt 9f4e7178d4 CI: Add CI workflow for Debian Buster 2021-05-24 21:53:42 +02:00
Peter Keresztes Schmidt 0392828ef8
Merge pull request #3256 from Carbenium/ci-centos
CI: Run on CentOS 7 and 8
2021-05-24 09:17:47 +02:00
Peter Keresztes Schmidt e232b5d1a7 Build: Disable Wmissing-field-initializers on older GCC versions
GCC 5.1 corrected the behaviour in regard that the C++11 initialisation behaviour is respected.
2021-05-24 01:15:00 +02:00
Peter Keresztes Schmidt 9900fc1273 tests/Font: Avoid lambda capture initialization
Remove the use of this language feature until we raise the requirements to C++14.
2021-05-24 00:55:46 +02:00
Peter Keresztes Schmidt e5cac38521 Comms: Make sure sun_path is NUL-terminated
When using strncpy the NUL-termination can go missing if the string to be copied is longer than the buffer.
Make sure the last character in the buffer is NUL.
If this really happens, the error (non-existing path due to truncation) will be caught during bind-ing.

Fixes the following warning:
/home/peterke/DEV/zoneminder/src/zm_comms.cpp: In member function ‘bool ZM::SockAddrUnix::resolve(const char*, const char*)’:
/home/peterke/DEV/zoneminder/src/zm_comms.cpp:207:10: warning: ‘char* strncpy(char*, const char*, size_t)’ specified bound 108 equals destination size [-Wstringop-truncation]
  207 |   strncpy(mAddrUn.sun_path, path, sizeof(mAddrUn.sun_path));
      |   ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2021-05-24 00:44:15 +02:00
Peter Keresztes Schmidt 93abbdf964 CI: Run on CentOS 7 and 8 2021-05-24 00:20:42 +02:00
Shao Yu-Lung (Allen) 4a1d983ff1 web ui add lang (Chinese Traditional) 2021-05-24 00:05:59 +08:00
anon8675309 b2391e952f Enable gitlab CI to build debian packages 2021-05-23 01:45:07 -05:00
Isaac Connor f6fcc2144f jquery.js doesn't exist, so link jquery.min.js instead 2021-05-22 13:59:32 -04:00
Isaac Connor 4c99baf725 Use data-onclick instead of data-on-click-this. Load form by id instead of passed in element. Fixes #3250 2021-05-22 13:59:10 -04:00
Isaac Connor 1caeb67a3e fix behaviour of reverse and fast forward buttons. Fixes #3251 2021-05-22 13:39:42 -04:00
Isaac Connor e16d71b9c6 spacing, code style, code comments 2021-05-22 13:39:42 -04:00
Isaac Connor 317ce7692e fix behaviour of reverse and fast forward buttons. Fixes #3251 2021-05-22 13:38:52 -04:00
Isaac Connor bc384d6fbe spacing, code style, code comments 2021-05-22 11:34:09 -04:00
Andrew Bauer 800a8ecc2e sync rpm specfile changelog with rpmfusion 2021-05-22 07:00:07 -05:00
Andrew Bauer 2e12bc08cd add 1.37 changelog entry to rpm specfile 2021-05-22 06:58:44 -05:00
Andrew Bauer 8d8b87743e sync rpm specfile changelog with rpmfusion 2021-05-22 06:55:52 -05:00
Peter Keresztes Schmidt e881e97c06 Logger: Fix DB log messages not being populated
We need to `resize` the buffer string since `reserve` does not guarantee that the buffer is
actually available.

Follow-up on 298415fff3
2021-05-22 10:52:57 +02:00
Andrew Bauer cb0a421d25 use latest rtspserver commit 2021-05-21 15:10:42 -05:00
Andrew Bauer eb387b5453 use latest rtspserver commit 2021-05-21 15:08:40 -05:00
Isaac Connor 2afeaefec4 Set version to 1.36.1 for release 2021-05-21 10:46:56 -04:00
Isaac Connor d218d81f87 Merge branch 'fix_out_of_files_in_encoding' into release-1.36 2021-05-21 10:39:58 -04:00
Isaac Connor a0df6aacaf Spacing 2021-05-21 10:38:55 -04:00
Isaac Connor 4fcdeb7287 Fix alignment in get_out_frame. Fixes #3233. If width % 32 then we can't use the more efficient 32 aligned scaling. 2021-05-21 10:37:51 -04:00
Isaac Connor 797a4adf70 Merge branch 'master' into fix_out_of_files_in_encoding 2021-05-20 18:56:16 -04:00
Isaac Connor 3540101c68 change mem_file to std::string to resolve initialization problems 2021-05-20 18:55:29 -04:00
Isaac Connor dd99d9ff22 include memory to fix build on centos 7 2021-05-20 18:55:17 -04:00
Isaac Connor 294d29580e Fix initializers to compile on centos7 2021-05-20 18:55:07 -04:00
Isaac Connor f947c041df Fix status of delete button when archived. Change title to say that you can't delete due to archived 2021-05-20 18:54:37 -04:00
Isaac Connor 2f78916ab8 change mem_file to std::string to resolve initialization problems 2021-05-20 16:28:22 -04:00
Isaac Connor 16d9819796 include memory to fix build on centos 7 2021-05-20 15:56:31 -04:00
Isaac Connor 7ad92e51c3 Fix initializers to compile on centos7 2021-05-20 15:56:15 -04:00
Isaac Connor 1d5cdf9965 use ubuntu2004 for hirsute 2021-05-19 21:41:35 -04:00
Isaac Connor 1cd59c189d Remove debug 2021-05-19 20:48:54 -04:00
Isaac Connor 0b4c35c58e Merge pull request #3241 from connortechnology/fix_3239
Fix 3239
2021-05-19 20:39:42 -04:00
Isaac Connor 1abbc187e9 Merge pull request #3242 from connortechnology/fix_3232_api_monitor_event_summaries
Add Event_Summary model so that it is included in monitor listing
2021-05-19 20:32:50 -04:00