ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
21,997 Commits
32 Branches
93 Tags
162 MiB
Commit Graph

21997 Commits (74b8bf3a2aff4a8b2df83a5db85dce78befe244f)

Author SHA1 Message Date
Isaac Connor 74b8bf3a2a decodeURI when taking password from uri. Always update username/password. 2023-02-18 18:02:15 -05:00
Isaac Connor 853bde63e1
Merge pull request #3662 from ZoneMinder/dependabot/composer/web/firebase/php-jwt-6.0.0 
Bump firebase/php-jwt from 5.0.0 to 6.0.0 in /web
 2023-02-17 10:14:33 -05:00
dependabot[bot] 2412fefdf5
Bump firebase/php-jwt from 5.0.0 to 6.0.0 in /web 
Bumps [firebase/php-jwt](https://github.com/firebase/php-jwt) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/firebase/php-jwt/releases)
- [Changelog](https://github.com/firebase/php-jwt/blob/main/CHANGELOG.md)
- [Commits](https://github.com/firebase/php-jwt/compare/v5.0.0...v6.0.0)

---
updated-dependencies:
- dependency-name: firebase/php-jwt
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-17 14:54:52 +00:00
Isaac Connor 3e34b36ec0 Fix email structure for ios 2023-02-16 17:24:23 -05:00
Isaac Connor a2e9cc23cb Set a short expiry 1min and set the cookie name to include the filter so that each and every filter gets it;s own pagination saved. Fixes #3510 2023-02-16 14:10:41 -05:00
Isaac Connor ee89169a7b Use reload instead of restart on zone save 2023-02-16 14:10:30 -05:00
Isaac Connor 855ab6f141 Add reload to monitor zmcControl 2023-02-16 14:10:21 -05:00
Isaac Connor f044d04271 Stop streams when clicking cancel/Save so that we don't log errors trying to access a dead zms. Fixes #3643 2023-02-16 14:10:12 -05:00
Isaac Connor d750daebbc Fix NewStorage=>self 2023-02-16 12:17:38 -05:00
Isaac Connor 42da035f27 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-02-16 11:52:27 -05:00
Isaac Connor 9aa44645dd Hack s3 with LWP to not cache connections so that we don't run out of files 2023-02-16 11:52:16 -05:00
Isaac Connor f437aadbe6 Update s3fs url parsing to match that in Event 2023-02-16 11:51:11 -05:00
Isaac Connor 07115422e7 Handle case where event has been moved but db not updated. This can happen when using a transaction and the db goes away. 2023-02-16 09:39:54 -05:00
Isaac Connor c50209f66c Listing dir contents really fills up logs. Make it only report on level 4 2023-02-16 09:30:47 -05:00
Isaac Connor 4b6f47eebd Fixup email structure so that inline images properly display while also having a text version. 2023-02-15 17:41:19 -05:00
Isaac Connor 1a8a84da96 Remove debug when relay not hashed 2023-02-15 15:02:22 -05:00
Isaac Connor 8ec5946791 Add backtrace to value not in values warning 2023-02-15 15:02:11 -05:00
Isaac Connor c009ef1bbe Fix AlarmFrames validity test 2023-02-15 15:00:23 -05:00
Isaac Connor 71265a8271 Define serversr, stats for simple widget 2023-02-15 15:00:13 -05:00
Isaac Connor 113171e5ee username in session can also be unset 2023-02-15 13:46:34 -05:00
Isaac Connor ff528e578f Show 0 instead of null in storage disk used column 2023-02-15 11:00:59 -05:00
Isaac Connor 1e77b58409 Don't set NextTimeStamp when we have a change of event. 2023-02-15 11:00:33 -05:00
Isaac Connor 30a75d81d2 Turn off debug, fix frame->frames typo 2023-02-15 10:24:45 -05:00
Isaac Connor 1a215dab3e Handle no frames in data gracefully 2023-02-15 10:20:59 -05:00
Isaac Connor e31fa4a4c3 Clear action when loading events. 2023-02-14 17:56:55 -05:00
Isaac Connor 40e7f8a517 Handle SESSION[password] not being set which happens when you switch AUTH_RELAY to plain. 2023-02-14 17:10:58 -05:00
Isaac Connor 29b688a2a5 Fix storageareas not being defined. 2023-02-14 17:05:20 -05:00
Isaac Connor ac5fab0239 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-02-14 17:04:38 -05:00
Isaac Connor 1fa0253fa5 When switching from hashed to plain relay, the session won't have password. So prevent errors. 2023-02-14 17:04:32 -05:00
Isaac Connor 52bdbae56b
Merge pull request #3659 from covertpluto3502/patch-1 
Update ubuntu.rst
 2023-02-14 14:00:20 -05:00
Alex Jiang c693268b87
Update ubuntu.rst 2023-02-14 18:10:54 +00:00
Isaac Connor 03b52a1ee5 Strip https off host and don't use virtualhost method. 2023-02-13 17:27:51 -05:00
Isaac Connor dedff86511 Allow caching of images 2023-02-13 16:15:12 -05:00
Isaac Connor 50b462b3a0 Use scaled images when displaying alarm and objdetect images 2023-02-13 16:02:36 -05:00
Isaac Connor 4889358f38 Add the actual packet, not the first packet over and over and over. Fixes #3656 2023-02-13 14:46:56 -05:00
Isaac Connor c6e93036f3 Include command line in debug output when generating images 2023-02-13 14:46:33 -05:00
Isaac Connor b6c729c700 Improve s3 url parsing and use Net::Amazon::S3::Vendor 2023-02-12 16:49:46 -05:00
Isaac Connor aba6281296 Fix typo 2023-02-12 16:49:46 -05:00
Isaac Connor 28cf2570a9 tabs instead of spaces are messing up ul layout 2023-02-12 16:37:44 -05:00
Isaac Connor 6893a3d84d Prevent duplicate attachments. Use eri_encode to escape content-id 2023-02-11 15:35:10 -05:00
Isaac Connor 44f75508c8 Attach a text version of body 2023-02-11 12:36:51 -05:00
Isaac Connor def5a1794c Don't try to do AWS delete if parsing failed 2023-02-11 12:36:33 -05:00
Isaac Connor 6821be5d17 Add Content-ID to attachments 2023-02-11 09:21:00 -05:00
Isaac Connor 7960496044 Handle https?:// in the host 2023-02-11 09:19:53 -05:00
Isaac Connor 691e21997b Test out replacing attached image tag with cid based img 2023-02-10 18:49:50 -05:00
Isaac Connor ccc4588c99 Don't include Server column if there is only 1 2023-02-10 16:57:38 -05:00
Isaac Connor 14bfe38778 Fix eslint 2023-02-10 13:49:01 -05:00
Isaac Connor 91de85285c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-02-10 13:02:54 -05:00
Isaac Connor a3e5a1a019 Set minimum gsoap to 2.8.91 which is the version in ubuntu focal. Hoping this disables failed build on bionic 2023-02-10 13:02:46 -05:00
Isaac Connor 86f63a9c01 remove extra p tag and reduce php tags 2023-02-10 13:00:46 -05:00