Commit Graph

780 Commits

Author SHA1 Message Date
Isaac Connor d59bc4ca6d add Enabled to Storage 2020-03-04 10:15:44 -05:00
Isaac Connor 2f48c442cc add Enabled to Storage 2020-03-04 10:15:35 -05:00
Dinko Bajric 6b2f78c192 Added presets for Amcrest IP8M-T2499EW Camera 2020-02-28 21:08:02 -08:00
Isaac Connor 92f87756ff Merge branch 'release-1.34' 2020-02-28 17:14:22 -05:00
Isaac Connor 52cb2441f0 Bump version to 1.34.5 for release 2020-02-25 20:46:59 -05:00
Isaac Connor bf9ba39aa2 Merge branch 'release-1.34' 2020-02-25 18:22:55 -05:00
Isaac Connor e630550d0f bump version for release 1.34.4 2020-02-24 14:44:19 -05:00
Isaac Connor 93fa1cd03c Convert the default filters to insert by specifying the column names to make them less fragile to db changes. Mostly this helps developers who may have other columns defined than what is currently in use in the version they are working on. 2020-02-21 09:48:01 -05:00
Isaac Connor 300402013c Merge branch 'master' into improve_filter_emails 2020-02-19 14:44:37 -05:00
Isaac Connor ea2eba4110 bump version to 1.34.3 2020-02-19 13:50:27 -05:00
zlodag 0c97bff645 monitor presets and controls for D-Link DCS-5020L 2020-02-19 22:50:09 +13:00
Isaac Connor fc8f94c315 Merge branch 'master' into improve_filter_emails 2020-02-17 16:42:44 -05:00
Isaac Connor af6b51f0d3 release 1.34.2 2020-02-04 16:47:33 -05:00
Isaac Connor fb5111ffe4 bump version to 1.34.1 for release 2020-01-24 17:01:47 -05:00
Isaac Connor 259530fd3d Add EmailTo,EmailSubject,EmailBody fields to Filter 2020-01-22 13:52:05 -05:00
Isaac Connor d4bc0bf72b bump version for release to 1.34.0 2020-01-15 17:31:06 -05:00
Isaac Connor a84031f819 TEXT fields cannot have default values 2019-12-19 09:25:22 -05:00
Isaac Connor 34354f5871 Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab. 2019-12-18 12:13:00 -05:00
Isaac Connor 55dd40ec85 Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:47:45 -05:00
Isaac Connor 01d61f4f32 Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:47:25 -05:00
Isaac Connor f3f253c083 Query was renamed to Query_json 2019-09-28 11:55:28 -04:00
Isaac Connor 6bd2267483 Fix installing default filters failing due to missing values for AutoCopy and AutoCopyTo 2019-09-06 10:55:34 -04:00
Isaac Connor 6f59d63e08 Add missing AutoCopy and AutoCopyTo in db creation 2019-09-05 09:55:58 -04:00
Isaac Connor 962049fa31 Merge branch 'master' into filter_add_copy 2019-08-06 20:17:21 -04:00
Isaac Connor 90cb5d018a
Fix 2673 (#2675)
* Change MaxFPS to DECIMAL(5,3) to handle values like 1/60 = 0.017

* When fps < 1 we may need to wait longer than 10s.  Also, we cannot sleep for a long time, because we may need to send a keep alive or check the command queue. So limit the sleep to 1s

* Bump version

* Update MaxFPS to Decimal(5,3)

* Fix missing ;
2019-07-31 11:42:38 -04:00
Isaac Connor 57133691e9 Add update script for SecondaryStorageArea capability in Events and Filters 2019-07-24 10:53:23 -04:00
Isaac Connor 2d556e6402 Add SecondaryStorageId to Events 2019-07-24 10:52:32 -04:00
Isaac Connor 5b896b5e5c Replace password('admin') with the resulting string because use of password is deprecated 2019-07-08 14:16:57 -04:00
bluikko aa817adbed Add primary keys to Logs and Stats tables (#2653)
* Add primary keys to Logs and Stats tables

Adds an auto_increment int(10) Id as PRIMARY KEY to Logs and Stats tables.

Closes ZoneMinder#2550 and makes ZoneMinder compatible with Galera writeset replication for InnoDB (Galera Cluster, Percona XtraDB Cluster).

*  Do ALTER TABLE only if columns do not exist

*  Add forgotten prepare/execute
2019-07-07 08:26:06 -04:00
Isaac Connor 19af25bf1a add DecoderHWAccel fields to Monitors 2019-06-25 15:29:46 -04:00
Isaac Connor 6ed0074077
End continuous events on alarm (#2644)
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it

* Spacing, google code style and tabs to spaces

* add update script to add MinSectionLength

* Add min_section_length to enforce a minimum event length when closing continuous events on alarm
2019-06-24 11:29:00 -04:00
Kirill Zhuykov a244af49ad fix #2622 (#2623) 2019-05-28 10:57:01 -04:00
Pliable Pixels 915e9f05a9 merged fifo changes 2019-05-16 16:14:06 -04:00
Pliable Pixels 4027a5adf8 fix update script 2019-05-13 14:48:26 -04:00
Pliable Pixels 87e407aa90 forgot to checkin update file 2019-05-13 10:31:09 -04:00
Pliable Pixels 91b6d0103c remove M typo 2019-05-11 13:41:19 -04:00
Pliable Pixels ae14be916c initial plumbing to introduce token expiry and API bans per user 2019-05-11 13:39:40 -04:00
Chris faaec9e1d6 Another attempt to fix SQL Control values (#2600) 2019-05-06 12:14:03 -04:00
Isaac Connor 75b4f4f2b3 Add a few missing GREATESTs in the triggers. 2019-04-30 17:29:18 -04:00
Andrew Bauer 27344df373
fix typo 2019-04-30 07:15:00 -05:00
Andrew Bauer c57017bd34
Merge pull request #2587 from connortechnology/update_triggers_prevent_negatives
Use GREATEST function prevent negative values in event counts
2019-04-29 18:30:47 -05:00
cnighswonger ff738a99ba
Enabling relative iris methods 2019-04-29 16:06:41 -04:00
Isaac Connor 3c56b32b08 Use GREATEST function prevent negative values in event counts 2019-04-24 10:38:08 -04:00
Isaac Connor d776f63bd8 Change MonitorIds from TinyText to TEXT. Fixes #2569 2019-04-07 17:23:39 -04:00
Isaac Connor 3ab1c9983a Update Controls INSERTS to match new column count. Add a db update script to update the Controls table with the new CanReboot column 2019-04-02 09:05:52 -04:00
Isaac Connor b97801a174 Don't specify database name when turning off DEEP storage 2019-03-20 16:22:47 -04:00
Isaac Connor 71cd024fda spacing updates. Use MP4 instead of H264/H265 in viewing codec dropdown 2019-03-19 12:16:31 -04:00
Isaac Connor 927071bb4d Fix db update adding DefaultCodec 2019-03-19 11:08:14 -04:00
Isaac Connor 3f9564c10a Merge branch 'master' into storageareas 2019-03-19 10:37:35 -04:00
Chris ad5f6a8729 Camera reboot function (#2554)
* Adding a button for camera reboot function

This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.

* Adding reboot function option to contorl configuration

This patch adds a reboot option to the camera control configuration
view.

* Adding Reboot field to Controls table

This patch adds a Reboot field to the Controls table to support
a camera reboot control option.

* Correcting button value to match reset

* Updating language files

I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.

* Add missing forward slash
2019-03-18 14:49:05 -04:00