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
cf9c47149f
db: Add helper for escaping strings and use it
2021-07-06 10:20:45 +02:00
0b76892ddf
Merge pull request #3307 from pliablepixels/optimize-event-api
...
API: allow option to not load the frames DB table
2021-07-05 12:49:58 -04:00
95263d148d
Rename zm_update-1.35.29.sql zm_update-1.36.6.sql so that it gets picked up.
2021-07-05 10:35:26 -04:00
271c59c24f
Updating the size of the Longitude field
...
To address https://github.com/ZoneMinder/zoneminder/issues/3311
2021-07-05 10:34:24 -04:00
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
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
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
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
6c3f18a347
allow option to not load the frames DB table
2021-06-27 15:55:10 -04:00
e9845d96f4
Fix Archive FTP .zip filename not including monitor name. Fixes #3304
2021-06-23 10:30:42 -04:00
cb3dd78c61
Fix Archive FTP .zip filename not including monitor name. Fixes #3304
2021-06-23 10:27:23 -04:00
ef92f1ea16
Bump version to 1.36.5
2021-06-22 14:35:13 -04:00
610fdd3129
Remove the code to do adaptive skipping. We should never sleep when doing Analysis unless an error occurred.
2021-06-22 14:34:28 -04:00
c0875838af
Attempting to build the lastest tag instead of a hard-coded one
2021-06-20 21:11:06 -05:00
d927db1c0d
Attempting to build the lastest tag instead of a hard-coded one
2021-06-20 20:42:43 -05:00
f852f1716e
Attempting to build the lastest tag instead of a hard-coded one
2021-06-19 18:11:57 -05:00
479385bac7
Attempting to build the lastest tag instead of a hard-coded one
2021-06-19 17:49:23 -05:00
1e834f6088
Attempting to build the lastest tag instead of a hard-coded one
2021-06-19 16:03:13 -05:00
1096fa3f87
Attempting to build the lastest tag instead of a hard-coded one
2021-06-19 15:01:17 -05:00
b95cf72dc8
comment to rpm changelog regarding cmake
2021-06-18 15:30:19 -05:00
172a0555ed
only refer to cmake3 when building on el7
2021-06-18 15:30:10 -05:00
a423f2620e
Allow cakephp cache engine to be set during build
2021-06-18 15:29:54 -05:00
0edc91ffca
comment to rpm changelog regarding cmake
2021-06-18 15:27:24 -05:00
ec861c5e2b
only refer to cmake3 when building on el7
2021-06-18 15:25:17 -05:00
db7c5df8c1
Update zoneminder.spec
2021-06-18 13:08:17 -05:00
b59e911c43
Allow cakephp cache engine to be set during build
2021-06-18 12:12:01 -05:00
9438445d74
Fix PTZ Diagonal cmds. Fixes #3300
2021-06-16 15:56:08 -04:00
c3fb84bf88
Add an age component of 7d to /var/tmp/zm so that exports and other files go away
2021-06-15 10:44:02 -04:00
29fb2d3885
Add special handling of sorting by EndTime because it can be NULL. Fixes #3298
2021-06-15 10:34:33 -04:00
anon8675309
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt
Kendric Evans
Pliable Pixels
Andrew Bauer