ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,137 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

19137 Commits

Author SHA1 Message Date
Isaac Connor eecf568041 Pass exportStructure around so that it can be used to put the right filename to the jpg in the html. Fix flat zips. Fix video files being included if exportMisc is true. 2021-08-06 13:18:06 -04:00
Isaac Connor 105851b70c Actually delete the snapshot record, not just the event connection 2021-08-06 13:17:02 -04:00
Isaac Connor f236e25e22 Fix deleting snapshots 2021-08-06 13:11:04 -04:00
Isaac Connor 1f1678064e Allow specifying export Structure to get a flat zip 2021-08-06 13:10:44 -04:00
Isaac Connor 222909feb3 zmu may still output results even if it encounters errors, so continue even if we have an error return status from zmu. 2021-08-05 14:48:14 -04:00
Isaac Connor 7db25a5e1b Continue to work even if opener isn't defined, which it isn't anymore because we got rid of popups. Fixes save button on monitorprobe. 2021-08-05 14:48:14 -04:00
Isaac Connor acdd8bb08b Merge script sections just to remove bytes per view. 2021-08-05 14:48:14 -04:00
Isaac Connor a3a592d5e1 Fix errors due to not stopping the dbQueue. Fix crash when querying v4l devices 2021-08-05 14:48:14 -04:00
Isaac Connor 45bf28a104
Merge pull request #3321 from anon8675309/gitlab-ci 
Gitlab ci
 2021-08-05 13:34:05 -04:00
Isaac Connor 7dc36f67db output an error message image when we can't load a jpeg 2021-08-05 13:30:52 -04:00
Isaac Connor 0bcbff5dd5 Turn on export functionality for snapshots 2021-08-05 13:30:52 -04:00
Isaac Connor bed41ca44b Support specifying the export filename by passing the export_root 2021-08-05 13:30:52 -04:00
Isaac Connor 91903d2822 Fix user summary, as there must be a space between -u and dbuser, etc 2021-08-05 13:30:52 -04:00
Isaac Connor 5bc9cfaa6a Fix styling of the shutdown button 2021-08-05 13:30:52 -04:00
Isaac Connor 85d5dd806e Read 4k at a time instead of 32 bytes. OS will read whatever is available. This basically reduces logging and a little cpu overhead 2021-08-05 13:30:52 -04:00
Isaac Connor dffc7aa2fd
Merge pull request #3326 from Carbenium/bullseye-readiness 
misc: Final bits for Debian Bullseye support
 2021-08-03 19:59:53 -04:00
Peter Keresztes Schmidt fb1849ff47 CI: Test package build with Debian Bullseye as well 2021-08-03 23:33:35 +02:00
Peter Keresztes Schmidt cce4b0aac4 docs: Reference current 1.36 version in installation instructions 2021-08-03 23:33:35 +02:00
Peter Keresztes Schmidt 2c0cf7a5a7 utils/startpackpack: Add support for Debian Bullseye 2021-08-03 23:33:35 +02:00
Peter Keresztes Schmidt b5765b4535 utils/startpackpack: Fix build for Ubuntu Bionic 2021-08-03 23:33:35 +02:00
Peter Keresztes Schmidt 7d84568b65 utils: Remove support for Ubuntu Groovy 
Groovy went EOL as on July 22, 2021. See
https://fridge.ubuntu.com/2021/07/25/ubuntu-20-10-groovy-gorilla-end-of-life-reached-on-july-22-2021/
 2021-08-03 23:33:35 +02:00
Peter Keresztes Schmidt 50b73cf3d2 utils/packpack: Fix failure when building for Ubuntu Hirsute 2021-08-03 19:02:39 +02:00
Peter Keresztes Schmidt 4392198d14 Fix closing event in MOCORD mode 
Bug introduced in 707975e567
 2021-08-03 09:56:07 +02:00
Isaac Connor 9cb19005e5
Merge pull request #3323 from SteveGilvarry/Fix_Dark_modal 
Update Dark Skin to fix modal being light and some other issues
 2021-08-02 09:59:22 -04:00
Steven Gilvarry cb32630dc0 Update Dark Skin to fix modal being light and some other issues 
Fixed Modal style as per post to forums, then also fixed text area and select being white. Adjusted some other colours to work better. Console hover could be better still
 2021-08-01 13:33:22 +10:00
anon8675309 47f171c75c Simplified branch detection in build scripts for GitLab CI, increased maximum build time 2021-07-24 13:15:30 -05:00
anon8675309 649b5585c4 Simplified branch detection in build scripts for GitLab CI 2021-07-24 10:37:07 -05:00
Isaac Connor 75180f78e2
Merge pull request #3319 from anon8675309/gitlab-ci 
Gitlab ci
 2021-07-21 08:05:33 -04:00
Isaac Connor 14047bc820 Test for existence of file before adding it to zip. Apparently our glob can return the snapshot.jpg string even if it doesn't exist. This is a workaround to Archive::Zip not testing for failure and crashing. Fixes #3313 2021-07-08 11:03:56 -04:00
Isaac Connor 1766bbdfcd Handle the case when the monitor doesn't exist more gracefully and not crash. Fixes #3316 2021-07-08 10:07:01 -04:00
Isaac Connor b0cf3a4732
Merge pull request #3314 from Carbenium/path-max 
Fix Wformat for stringtf and convert path buffers depending on PATH_MAX to std::string
 2021-07-07 11:34:03 -04:00
Isaac Connor 411a5181e6
Merge pull request #3315 from Carbenium/db-misc 
Misc. cleanup of DB related code
 2021-07-06 14:00:40 -04:00
Peter Keresztes Schmidt eaf2e51b0c utils: Make sure the compiler can emit format warnings for stringtf 
Unfortunately the compilers can't emit Wformat warnings for variadic templates
and those can't be annotated with the format attribute.
Use a variadic function which can be annotated and thus warns on format string-args mismatches.

Ref 0796a2262e
 2021-07-06 10:33:17 +02:00
Peter Keresztes Schmidt 80b08a2075 Convert path buffers depending on PATH_MAX to std::string 2021-07-06 10:33:17 +02:00
Peter Keresztes Schmidt 65656de6ce db: Adjust the query methods to accept std::strings 2021-07-06 10:20:46 +02:00
Peter Keresztes Schmidt c60b577aec Convert more char array buffers to std::string 
Remove now unused ZM_SQL_*SIZE defines
 2021-07-06 10:20:46 +02:00
Peter Keresztes Schmidt fc15afefcf Event: Remove unused and broken prepared statement code 2021-07-06 10:20:45 +02:00
Peter Keresztes Schmidt cf9c47149f db: Add helper for escaping strings and use it 2021-07-06 10:20:45 +02:00
Isaac Connor 2b6d54fd81 move db update script so it gets used. Bump version to 1.37.1 for db update 2021-07-05 09:33:03 -04:00
Isaac Connor 6373ef9be7 move db update script so it gets used. Bump version to 1.37.1 for db update 2021-07-05 09:32:39 -04:00
Kendric Evans 7e8a064725 Updating the size of the Longitude field 
To address https://github.com/ZoneMinder/zoneminder/issues/3311
 2021-07-02 16:11:34 -06:00
Isaac Connor 415dce6548
Merge pull request #3307 from pliablepixels/optimize-event-api 
API: allow option to not load the frames DB table
 2021-06-27 23:08:09 -04:00
Pliable Pixels 6c3f18a347 allow option to not load the frames DB table 2021-06-27 15:55:10 -04:00
Isaac Connor e9845d96f4 Fix Archive FTP .zip filename not including monitor name. Fixes #3304 2021-06-23 10:30:42 -04:00
anon8675309 c0875838af Attempting to build the lastest tag instead of a hard-coded one 2021-06-20 21:11:06 -05:00
anon8675309 d927db1c0d Attempting to build the lastest tag instead of a hard-coded one 2021-06-20 20:42:43 -05:00
anon8675309 f852f1716e Attempting to build the lastest tag instead of a hard-coded one 2021-06-19 18:11:57 -05:00
anon8675309 479385bac7 Attempting to build the lastest tag instead of a hard-coded one 2021-06-19 17:49:23 -05:00
anon8675309 1e834f6088 Attempting to build the lastest tag instead of a hard-coded one 2021-06-19 16:03:13 -05:00
anon8675309 1096fa3f87 Attempting to build the lastest tag instead of a hard-coded one 2021-06-19 15:01:17 -05:00