672de6e84f
event may have changed (have endtime set) between load and saving Archived bit. Lock the event which now also reloads it.
2021-08-06 19:15:22 -04:00
500ced2dc5
When locking, use the results to reload the object fields fresh as they may have changed since the object was loaded
2021-08-06 19:14:43 -04:00
f2a1d06f64
Snapshot exports are now flat, without frame images
2021-08-06 13:18:31 -04:00
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
105851b70c
Actually delete the snapshot record, not just the event connection
2021-08-06 13:17:02 -04:00
f236e25e22
Fix deleting snapshots
2021-08-06 13:11:04 -04:00
1f1678064e
Allow specifying export Structure to get a flat zip
2021-08-06 13:10:44 -04:00
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
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
acdd8bb08b
Merge script sections just to remove bytes per view.
2021-08-05 14:48:14 -04:00
a3a592d5e1
Fix errors due to not stopping the dbQueue. Fix crash when querying v4l devices
2021-08-05 14:48:14 -04:00
45bf28a104
Merge pull request #3321 from anon8675309/gitlab-ci
...
Gitlab ci
2021-08-05 13:34:05 -04:00
7dc36f67db
output an error message image when we can't load a jpeg
2021-08-05 13:30:52 -04:00
0bcbff5dd5
Turn on export functionality for snapshots
2021-08-05 13:30:52 -04:00
bed41ca44b
Support specifying the export filename by passing the export_root
2021-08-05 13:30:52 -04:00
91903d2822
Fix user summary, as there must be a space between -u and dbuser, etc
2021-08-05 13:30:52 -04:00
5bc9cfaa6a
Fix styling of the shutdown button
2021-08-05 13:30:52 -04:00
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
dffc7aa2fd
Merge pull request #3326 from Carbenium/bullseye-readiness
...
misc: Final bits for Debian Bullseye support
2021-08-03 19:59:53 -04:00
fb1849ff47
CI: Test package build with Debian Bullseye as well
2021-08-03 23:33:35 +02:00
cce4b0aac4
docs: Reference current 1.36 version in installation instructions
2021-08-03 23:33:35 +02:00
2c0cf7a5a7
utils/startpackpack: Add support for Debian Bullseye
2021-08-03 23:33:35 +02:00
b5765b4535
utils/startpackpack: Fix build for Ubuntu Bionic
2021-08-03 23:33:35 +02:00
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
50b73cf3d2
utils/packpack: Fix failure when building for Ubuntu Hirsute
2021-08-03 19:02:39 +02:00
4392198d14
Fix closing event in MOCORD mode
...
Bug introduced in 707975e567
2021-08-03 09:56:07 +02:00
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
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
47f171c75c
Simplified branch detection in build scripts for GitLab CI, increased maximum build time
2021-07-24 13:15:30 -05:00
649b5585c4
Simplified branch detection in build scripts for GitLab CI
2021-07-24 10:37:07 -05:00
75180f78e2
Merge pull request #3319 from anon8675309/gitlab-ci
...
Gitlab ci
2021-07-21 08:05:33 -04:00
3e59ad9cb4
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:06:20 -04:00
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
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
c06cda6a65
Handle the case when the monitor doesn't exist more gracefully and not crash. Fixes #3316
2021-07-08 10:06:49 -04:00
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
413ac984eb
add models.sql
2021-07-07 09:48:24 -04:00
4ff4e1f780
add Manufacturer and Model dropdown/text inputs to monitor edit view
2021-07-07 09:47:55 -04:00
54f676a501
Add ManufacturerId_onchange and ModelId_onchange to hide/show the text input for custom entry
2021-07-07 09:47:32 -04:00
c6209ce460
Store new Model and Manufacturer when saving Monitor
2021-07-07 09:47:00 -04:00
3bb2b804b3
Include Model and Manufacturer to includes in Monitor.php
2021-07-07 09:46:36 -04:00
24a77d7fb3
Add ManufacturerId to Model
2021-07-07 09:46:12 -04:00
8df915e7a4
Fix merge.
2021-07-07 09:45:53 -04:00
cc486beed5
Add some Acti models
2021-07-07 09:45:23 -04:00
411a5181e6
Merge pull request #3315 from Carbenium/db-misc
...
Misc. cleanup of DB related code
2021-07-06 14:00:40 -04:00
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
80b08a2075
Convert path buffers depending on PATH_MAX to std::string
2021-07-06 10:33:17 +02:00
65656de6ce
db: Adjust the query methods to accept std::strings
2021-07-06 10:20:46 +02:00
c60b577aec
Convert more char array buffers to std::string
...
Remove now unused ZM_SQL_*SIZE defines
2021-07-06 10:20:46 +02:00
fc15afefcf
Event: Remove unused and broken prepared statement code
2021-07-06 10:20:45 +02:00
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt
Steven Gilvarry
anon8675309