mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-07-08 04:05:32 -04:00
Code Issues Packages Projects Releases Wiki Activity
16,935 Commits 99 Branches 106 Tags
a98eabd2bd9eaf1b459dd4e73641a8cd4e5c1ddd
Commit Graph

403 Commits

Author SHA1 Message Date
Isaac Connor
42ab098764 Add DecodingEnabled to Monitors 2020-12-10 14:06:16 -05:00
Isaac Connor
8ddde0d377 Update stock PurgeWhenFull and UpdateDiskSpace filters to add EndTime terms. Add FOREIGN KEYS to Groups_Monitors and Groups.ParentId 2020-12-03 13:11:24 -05:00
Isaac Connor
63c78b43f8 Change event stats to Monitor_Status 2020-11-06 13:27:00 -05:00
Isaac Connor
adbd3486bf Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:49:39 -05:00
Isaac Connor
903c6a2d5a Add EndTime IS NOT NULL to UpdateDiskSpace Filter 2020-11-03 08:41:57 -05:00
Isaac Connor
432ae9894b Add EndTime IS NOT NULL to PurgeWhenFull Filter 2020-11-03 08:34:41 -05:00
Isaac Connor
858674c0b2 Merge branch 'master' into filter_locking 2020-10-28 12:52:52 -04:00
Isaac Connor
3825af8243 Add FOREIGN KEYS for EventId in Frames, Stats. MonitorId, ZoneId in Stats. MonitorId in Zones. 2020-10-28 09:19:54 -04:00
Isaac Connor
1fde123ebc add LockRows to Filters 2020-10-26 18:47:03 -04:00
Isaac Connor
bf83cf9346 Add AutoUnarchive column to Filters 2020-10-12 10:53:00 -04:00
Isaac Connor
2e14d18a13 add Sessions table 2020-10-02 14:49:44 -04:00
Isaac Connor
3eae356ed7 Bump to 1.35.8. Change table engine to InnoDb for Monitor_Status. 2020-09-30 09:39:31 -04:00
Isaac Connor
624bcdcde0 Add Latitude and Longitude to Monitors and monitor edit as well as using the geolocation api to auto-populate them 2020-09-24 09:01:30 -04:00
Isaac Connor
610f73a835 Merge branch 'release-1.34' 2020-08-17 19:30:32 -04:00
Isaac Connor
19fff95079 Remove default from LabelFormat 2020-08-11 17:31:32 -04:00
Isaac Connor
0905655377 Merge branch 'master' into add_user_to_filters 2020-06-05 17:08:14 -04:00
Isaac Connor
2b60b6b419 Add new ONVIF columns present in zm_update-1.35.4.sql 2020-05-20 09:50:17 -04:00
Isaac Connor
d1ca4ed81c Add UserId to pre-populated Filters 2020-05-07 10:57:51 -04:00
Isaac Connor
48df73fe35 Add UserId to Filters 2020-05-04 13:24:48 -04:00
hax0kartik
1d3ad05bb5 Start implementing VNC 2020-03-25 23:21:34 -07: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
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
zlodag
0c97bff645 monitor presets and controls for D-Link DCS-5020L 2020-02-19 22:50:09 +13:00
Isaac Connor
259530fd3d Add EmailTo,EmailSubject,EmailBody fields to Filter 2020-01-22 13:52:05 -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
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
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
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
Andrew Bauer
27344df373 fix typo 2019-04-30 07:15:00 -05:00
cnighswonger
ff738a99ba Enabling relative iris methods 2019-04-29 16:06:41 -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
71cd024fda spacing updates. Use MP4 instead of H264/H265 in viewing codec dropdown 2019-03-19 12:16:31 -04:00
Isaac Connor
3f9564c10a Merge branch 'master' into storageareas 2019-03-19 10:37:35 -04:00