Commit Graph

166 Commits

Author SHA1 Message Date
Isaac Connor 0103df9781 bump verison 2019-06-25 15:35:09 -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
Pliable Pixels ae14be916c initial plumbing to introduce token expiry and API bans per user 2019-05-11 13:39:40 -04:00
Isaac Connor 75b4f4f2b3 Add a few missing GREATESTs in the triggers. 2019-04-30 17:29:18 -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 d737e81e21 bump version for DefaultCodec in monitors 2019-03-06 14:57:05 -05:00
Isaac Connor 92ded81e26 bump version 2019-02-27 09:29:27 -05:00
Isaac Connor 512a6e19de bump version 2019-02-13 16:55:55 -05:00
Andrew Bauer 151c7677d8 add WebSite type to enum (#2382)
* add WebSite type to enum

* add website enum to update script

* update enum

* bump the version
2019-01-03 17:06:44 -05:00
Andrew Bauer af6b709ae1 bump to 1.33.0 development 2018-12-11 09:28:48 -06:00
Andrew Bauer 077c643da0 1.32.3 release 2018-12-08 08:22:36 -06:00
Andy Bauer 5b93b77499 bump verion to 1.32.2 2018-10-13 13:36:15 -05:00
Andy Bauer 5c6cf88d93 bump version to 1.32.1 2018-10-02 07:37:55 -05:00
Andrew Bauer 002bb67ccc bump version to 1.32.0 release 2018-09-12 07:09:25 -05:00
Isaac Connor c271948f3d bump version to 1.31.47 2018-08-24 12:26:44 -04:00
Isaac Connor 4e30a9e71c Stats.EventId must be a bigint too 2018-08-21 12:50:33 -04:00
Isaac Connor 11cedb4335 repeat the update that adds Refresh to Monitors. Bump version. 2018-07-31 10:27:34 -04:00
Isaac Connor 7e88d28857 bump version to .44 2018-04-26 21:58:19 -04:00
Andrew Bauer 86b2f6a12e New Monitor Type - Website (#2065)
* implement website monitor

* don't check certain fields when using website monitor

* continue to fix javascript errors for website monitors

* check $monitor, not $new_monitor here

* add website monitor documentation

was somehow left out of the initial commit

* fix corruption of functions.php

* add missing comma

* remove errors by testing for existence of key.  If it's a new monitor, then none of the keys will be valid

* If the monitor type is WebSite, then default Status to Running.

* put back start function that got lost in merge.  Don't start StreamCmd's if it's a WebSite

* Add midding comma

* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite

* Don't show control or any of the status fields for WebSite type monitors

* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
Isaac Connor bd5f4020ca bump version 2018-04-19 10:10:23 -04:00
Isaac Connor f9f78e9aa3 Convert event_id to a 64bit unsigned int 2018-04-12 13:40:11 -07:00
Isaac Connor 3056dd240d bump version to get Url in Storage 2018-03-28 08:23:13 -07:00
Isaac Connor 13ef478820 refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals. 2018-02-20 22:48:34 -05:00
Isaac Connor 0a63797bd4 bump version 2018-02-18 11:12:40 -05:00
Isaac Connor b119f7d731 bump version 2018-02-07 08:03:19 -05:00
Isaac Connor 0f83dfc769 Correct events_day, etc update trigger 2018-02-06 08:43:09 -05:00
Isaac Connor 9e000b1112 bump version for new triggers 2018-02-05 15:46:52 -05:00
Isaac Connor cfb7987f0f Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl 2018-02-03 14:54:30 -05:00
Isaac Connor 12c4ab07ea use COALESCE to ensure integer values 2018-02-03 11:01:26 -05:00
Isaac Connor 868e17a414 Allow Method in Monitors to be NULL 2018-02-02 10:31:55 -05:00
Isaac Connor 40379f7df6 bump version 2018-02-01 11:33:56 -05:00
Isaac Connor ef51a21df4 add new runstate called Connected 2018-01-31 14:36:41 -05:00
Isaac Connor ff12495364 bump version for column rename in Monitor_Status 2018-01-29 09:28:19 -05:00
Isaac Connor 50fc4a2d94 Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table. 2018-01-24 11:51:11 -05:00
Isaac 8544589843 bump version to 1.31.27 for new event_update trigger 2018-01-23 18:16:24 +01:00
Isaac Connor e372a490fa bump version 2018-01-19 13:32:58 -05:00
Isaac Connor f4b6360f14 bump version 2018-01-19 12:15:12 -05:00
Isaac Connor 59a1272307 bump version 2018-01-18 11:39:33 -05:00
Isaac Connor 306e9a75ee Fix issues with a period in the column name 2018-01-16 21:45:01 -05:00
Isaac Connor 9f42871c86 Fix Zone Triggers, bump version 2018-01-16 11:49:17 -05:00
Isaac Connor 45ee7284f5 bump version 2018-01-16 09:32:24 -05:00
Isaac Connor e605b48aa4 bump version to 1.31.20 2018-01-10 13:20:46 -05:00
Isaac Connor 4033cf5ffc bump version to 1.31.19 with triggers 2018-01-04 13:07:02 -05:00
Isaac Connor b62343fb2c bump to 1.31.18 2018-01-01 13:19:30 -05:00
Isaac Connor d312482a2b add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE 2017-12-18 12:52:26 -05:00
Isaac Connor 7bba52e0d4 bump version 2017-12-04 16:52:23 -05:00
Isaac Connor 8a40a613bf bump version 2017-11-24 15:42:20 -05:00
Isaac Connor 47b60e4215 bump up to 1.31.14 2017-11-23 09:02:09 -05:00
Isaac Connor f89680e648 bump version 2017-10-27 15:39:08 -07:00
Isaac Connor a4b153a4f8 bnumpm version to pickup Servers updates 2017-10-24 15:13:18 -07:00
Isaac Connor 8abb8a9259 add Type to Storage 2017-10-12 07:32:48 -07:00
Isaac Connor 9f22b3ccf4 bump version 2017-10-10 12:59:26 -04:00
Isaac Connor b2426321b0 increase the length of MonitorIds in Groups 2017-10-04 21:53:47 -04:00
APHW2 MFGENG 354262c557 wip nvsocket 2017-10-03 13:28:56 -07:00
Isaac Connor 99c602e83d add ParentId to Groups, bump version 2017-09-28 12:23:23 -04:00
Isaac Connor a5079f205e add Manufacturers and Models Tables 2017-08-25 15:35:17 -04:00
Isaac Connor cb98e3faea bump version to 1.31.3 2017-07-11 14:11:15 -04:00
Isaac Connor 085d239a6e Merge branch 'master' into storageareas 2017-06-13 18:02:28 -04:00
Isaac Connor 01717a5c14 Merge branch 'master' into filter_by_runstate 2017-06-06 20:34:47 -04:00
Isaac Connor b23c45c9bc bump version to 1.31.0 2017-05-29 10:00:46 -04:00
Andy Bauer 12fc011a29 1.30.4 release 2017-05-09 09:54:48 -05:00
Andy Bauer fd8aa62927 bump 1.30.3 release 2017-05-02 13:25:56 -05:00
Isaac Connor 10732f039d update to 1.31.0 2017-04-21 12:45:44 -04:00
Isaac Connor 85727dbe2b bump version and set Path to allow NULLS 2017-01-30 17:25:07 -05:00
Isaac Connor 2829b146d5 drop the not null from EncoderParameters 2017-01-23 10:30:46 -05:00
Isaac Connor d63972ac3b need to bump version due to runstate stuff 2017-01-17 09:21:23 -05:00
Isaac Connor ab34127d62 bump version too 2017-01-16 21:31:45 -05:00
Isaac Connor 7063d218b9 bump version to 1.30.10 2016-12-12 22:08:34 -05:00
Isaac Connor 5bd41fd65f db update script requires version bump to 1.30.1 2016-12-12 21:56:17 -05:00
Isaac Connor 4fc85fd89c add indexes for Monitors(ServerId) and Servers(Name) 2016-10-20 13:18:33 -04:00
Isaac Connor 5b8b9c5345 merge update 2016-10-12 09:24:10 -04:00
Isaac Connor 85b2ba73ab change the behaviour of StorageID. Now it will NOT NULL default 0 and a value of 0 means use ZM_EVENTS_PATH 2016-09-14 09:31:57 -04:00
Isaac Connor 6994a76488 cleanup, update version #'s on db update scripts that need to move because we released 1.30 2016-08-30 12:27:45 -04:00
Isaac Connor df6aaf5dec bump to 1.30.4 2016-07-13 12:45:35 -04:00
Isaac Connor c6761dd094 fix merge 2016-06-21 14:02:36 -04:00
Isaac Connor e29a0ebe71 Merge branch 'feature-h264-videostorage' into storageareas 2016-06-21 13:48:32 -04:00
Isaac Connor 708f9a6240 bump version to 1.30.3 2016-06-13 09:45:17 -04:00
Andy Bauer fb6c129f8b bump version to 1.30.0 2016-06-04 13:46:23 -05:00
Andrew Bauer 74a011fb4d Update version
This needs to stay at 1.29.0 until we release!
2016-06-01 08:05:45 -05:00
Isaac Connor 40c5e5c4b9 bump version file to 1.30 2016-06-01 08:54:33 -04:00
Andrew Bauer 176220f1bf Update version
Bumping back to 1.29.0
Note to all: We need to remember to bump this at the moment we create our next release
2016-04-08 07:44:30 -05:00
Andrew Bauer ad13d889fe bump version from 1.29.0 to 1.29.1 2016-04-06 09:30:47 -05:00
Isaac Connor a07dee8a34 bump version to 1.30.2 2016-02-05 11:58:40 -05:00
Isaac Connor d65c9d797b fix merge, update to 1.30.1 2016-02-04 12:13:48 -05:00
Andy Bauer 94ce84af40 Bump version to 1.29.0 2016-01-01 10:15:36 -06:00
Isaac Connor 8e25b80252 bump version due to db change adding ServerId to Logs 2015-12-31 10:14:20 -05:00
Robin Daermann b611d9fcae Bump database version to 1.28.109 2015-11-04 17:29:37 +01:00
Isaac Connor 029044bca3 merge master, bump version 2015-10-23 16:14:49 -04:00
Kyle Johnson 9dcb3e1df3 Add Index to Frames table. Fixes #1085. 2015-10-22 11:40:25 -06:00
Isaac Connor ea87ffe66f merge master, bump version to 1.28.108 2015-10-01 11:52:49 -04:00
Kyle Johnson b94a148559 Bump version 2015-09-29 14:28:54 -06:00
Isaac Connor 70fa177a32 bump db version 2015-08-31 16:04:34 -04:00
Andy Bauer 4a04d0411b bump version to 1.28.106 2015-08-29 08:00:02 -05:00
Andy Bauer 395e628541 Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
Conflicts:
	CMakeLists.txt
	configure.ac
	version
2015-08-29 07:57:18 -05:00
Andy Bauer 4fdd32b596 bump version to 1.28.106 2015-08-29 07:53:08 -05:00
Andrew Bauer 9abc161995 bump version to 1.28.105 2015-08-21 10:33:42 -05:00
Robin Daermann fbcd6f365b Change database schema (add 'Blacken' zone type) and bump version to 1.28.105 2015-08-20 16:17:08 +02:00
Andrew Bauer fe3595bfa1 Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_update-1.28.101.sql
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
2015-08-18 20:20:53 -05:00