c539969faa
Cleanup
2021-04-23 14:52:29 -04:00
8a59d60854
add ModectDuringPTZ to Monitors
2021-04-23 14:52:29 -04:00
bd65420c07
Specify columns when inserting admin user. Add Snapshots column
2021-04-14 13:00:16 -04:00
7e579fd851
Implement Snapshots user permission
2021-04-12 15:59:31 -04:00
ed29021179
Rough in an importance setting in monitor that we can use to decrease the log level of certain events like PrimeCapture for cameras that we don't care about
2021-04-11 12:59:18 -04:00
6319ea887c
Need to install generate update script
2021-04-09 21:55:07 -04:00
35b3d236e0
Fix typo in triggers
2021-04-09 19:47:08 -04:00
4e5ef01156
Fixup event summary column population, update triggers
2021-04-09 16:46:36 -04:00
c5ca123042
Move event summaries to their own table to reduce contention on Monitor_Status
2021-04-09 10:16:16 -04:00
9f5bc8b2b9
Merge pull request #3174 from akeyx/3173-bugfix-fix-onvif-control
...
3173 bugfix fix onvif control
2021-03-30 18:38:00 -04:00
dedf42371b
copy onvif.pm which isn't actually onvif to FoscamCGI.pm We will later replace onvif.pm with an Actual onvif implementation.
2021-03-30 18:32:42 -04:00
569efd8471
Add MaxImageBufferCount and udpate values as appropriate in update script
2021-03-26 14:32:06 -04:00
7db3895458
Fix default user creation after we added HomeView column
2021-03-14 20:11:13 -04:00
11c2318a05
Rough in the ui for Snapshots
2021-03-12 09:28:05 -05:00
620806a1bf
Add Snapshots and Snapshot_Events Tables. Add HomeView to Users.
2021-03-12 09:26:13 -05:00
95fe689d58
WIP, rabbit hole too deep
2021-03-03 09:55:57 -05:00
0eab9987fc
Just updated the script with moveMap and moveRel functions.
2021-02-26 00:11:29 +00:00
36f11158df
Replaced the onvif control module with a modified version of Netcat.
...
The original onvif module was NOT at all ONVIF protocol implementation.
This one pretty much copies the Netcat module but with a bit of clarity
to the XML that is sent to the camera but most importantly allows
specification of full onvif URL including authentication and control URI
through the Control Address field. Parsing of the url is done through a
combination of sane defaults and the URI module.
2021-02-25 22:37:34 +00:00
5c6ba2f27f
add RTSPServer column to Monitors
2021-02-02 23:19:52 -05:00
b409407b60
redo update from 1.31.40
2021-01-27 09:58:55 -05:00
159f611274
Add Encoder if missing
2021-01-27 09:55:48 -05:00
01c74fdac3
Add RTSPStreamName to Monitors table. Bump version to 1.35.19
2021-03-01 16:46:48 -05:00
671d58f0d0
bump version and put back ZM_MIN_RTSP_PORT setting
2021-01-26 12:35:17 -05:00
db8fead52b
Add more encoder options
2020-12-29 12:18:57 -05:00
284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
0702b64cc4
Merge branch 'master' into zma_to_thread
2020-12-15 10:51:40 -05:00
06ecb3ccb1
Add update script to add DecodeEnabled
2020-12-10 14:39:14 -05:00
42ab098764
Add DecodingEnabled to Monitors
2020-12-10 14:06:16 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
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
b5e4d242ba
Add zm_update-1.35.15.sql that will attempt to add EndTime term to stock filters.
2020-12-03 11:23:25 -05:00
8397ec3b9d
Merge branch 'release-1.34'
2020-12-01 14:28:10 -05:00
be27630a85
escape the word Groups
2020-11-23 19:33:53 -05:00
4deb3a8d84
escape the word Groups
2020-11-23 19:31:21 -05:00
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
8f456e7c3d
Add a useful warning message regarding the update needing SUPER prvilege
2020-11-10 12:38:10 -05:00
b3e3fea79f
Update summary event count tables
2020-11-09 12:26:14 -05:00
4b4863c44a
Fix remaining references to MonitorStatus.Id
2020-11-06 16:07:40 -05:00
2e7aa17882
Fix triggers that update Storage
2020-11-06 14:32:21 -05:00
691ff5881d
Fix some commas
2020-11-06 14:28:11 -05:00
98e296a2c8
Move event stat totals to Monitor_Status.
2020-11-06 14:15:05 -05:00
63c78b43f8
Change event stats to Monitor_Status
2020-11-06 13:27:00 -05:00
018abe39c2
Use rename commands that work on mysql 5.7
2020-11-04 18:11:24 -05:00
c3d43838da
Update StartTime to StartDateTime and EndTime to EndDateTime
2020-11-04 14:41:32 -05:00
adbd3486bf
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:49:39 -05:00
c72ceffe3d
Improved testing for existence of foreign keys, better descriptive output of steps.
2020-11-03 12:30:27 -05:00
903c6a2d5a
Add EndTime IS NOT NULL to UpdateDiskSpace Filter
2020-11-03 08:41:57 -05:00
432ae9894b
Add EndTime IS NOT NULL to PurgeWhenFull Filter
2020-11-03 08:34:41 -05:00
f7d23ce23b
Update zm_update-1.35.11.sql
...
Missing " ' " simbol that generates a MariaDB problem:
ERROR 1064 (42000) at line 14: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ''Adding foreign key for EventId to Frames' at line 1
2020-10-30 17:57:28 +01:00
e4a585eaa3
improvements to 1.35.11 db updates
2020-10-30 09:18:53 -04:00
a35c143094
Prevent extra foreign keys from being created and fix we can't delete from Zones. Must be done manually
2020-10-28 15:01:14 -04:00
86bf491fe1
Add Locking to filters, bump db to 1.35.12.
2020-10-28 12:55:32 -04:00
858674c0b2
Merge branch 'master' into filter_locking
2020-10-28 12:52:52 -04:00
43b7021f9c
ALTER Events.Id to BIGINT. This update got lost at somepoint. Add FOREIGN KEYS to Frames, Stats and Zones tables
2020-10-28 12:38:44 -04:00
3825af8243
Add FOREIGN KEYS for EventId in Frames, Stats. MonitorId, ZoneId in Stats. MonitorId in Zones.
2020-10-28 09:19:54 -04:00
cd9b16a467
add LockRows to Filters
2020-10-26 18:48:16 -04:00
1fde123ebc
add LockRows to Filters
2020-10-26 18:47:03 -04:00
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
1b2ab6cce9
Add AutoUnarchive column to Filters
2020-10-12 10:53:19 -04:00
bf83cf9346
Add AutoUnarchive column to Filters
2020-10-12 10:53:00 -04:00
aa157bfd78
AddManufacturerId and ModelId to Monitors
2020-10-11 09:56:35 -04:00
3e668b43cf
add Sessions table
2020-10-02 14:49:59 -04:00
2e14d18a13
add Sessions table
2020-10-02 14:49:44 -04:00
3eae356ed7
Bump to 1.35.8. Change table engine to InnoDb for Monitor_Status.
2020-09-30 09:39:31 -04:00
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
0a4a144bbc
Merge branch 'location'
2020-09-28 09:33:28 -04:00
c14e141295
Merge branch 'release-1.34'
2020-09-25 11:01:25 -04:00
32e0c92747
After adding SaveJPEGs to Events, need to populate them with SaveJPegs from MOnitors
2020-09-24 13:43:05 -04:00
aa875b019d
remove auto-generated update file that slipped in
2020-09-24 09:02:20 -04:00
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
e111edbb72
bump version to 1.35.6 to pick a db fix from 1.34.20
2020-08-23 11:53:43 -04:00
610f73a835
Merge branch 'release-1.34'
2020-08-17 19:30:32 -04:00
19fff95079
Remove default from LabelFormat
2020-08-11 17:31:32 -04:00
bf1c27e20a
Add db update to drop default value for LabelFormat. Fixes #2896
2020-08-11 14:14:31 -04:00
56fbfa0dd2
Add db update to drop default value for LabelFormat. Fixes #2896
2020-08-11 14:14:16 -04:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
0905655377
Merge branch 'master' into add_user_to_filters
2020-06-05 17:08:14 -04:00
2b60b6b419
Add new ONVIF columns present in zm_update-1.35.4.sql
2020-05-20 09:50:17 -04:00
c83621822f
Rename Config* to ONVIF_*
2020-05-12 15:46:07 -04:00
9beb1973df
move the db update script to a modern version so it gets executed
...
move zmonvif-trigger.pl to /scripts
2020-05-09 18:04:27 -04:00
75082064fd
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
2020-05-09 16:40:17 -04:00
732bb5416f
Merge branch 'master' into onvif_updated
2020-05-09 16:26:29 -04:00
d1ca4ed81c
Add UserId to pre-populated Filters
2020-05-07 10:57:51 -04:00
30adcb7cf5
Add a db update to alter Frames.Id to a bigint
2020-05-05 18:04:24 -04:00
48df73fe35
Add UserId to Filters
2020-05-04 13:24:48 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
acc7dbeb8e
Update zm_update-1.35.2.sql
2020-04-23 18:01:01 -04:00
fc25a777fd
Bump version for db update adding VNC Monitor Type
2020-03-27 14:47:59 -04:00
ae80b3b859
Start implementing VNC
2020-03-27 14:32:50 -04:00
4ce944da23
Merge branch 'release-1.34'
2020-03-26 15:38:35 -04:00
c880793fdc
bump version to 1.34.7
2020-03-26 15:34:36 -04:00
b482993d33
Merge branch 'release-1.34'
2020-03-06 15:04:48 -05:00
6d787fd77e
Bump version for 1.34.6
2020-03-06 14:52:38 -05:00
d59bc4ca6d
add Enabled to Storage
2020-03-04 10:15:44 -05:00
2f48c442cc
add Enabled to Storage
2020-03-04 10:15:35 -05:00
6b2f78c192
Added presets for Amcrest IP8M-T2499EW Camera
2020-02-28 21:08:02 -08:00
92f87756ff
Merge branch 'release-1.34'
2020-02-28 17:14:22 -05:00
52cb2441f0
Bump version to 1.34.5 for release
2020-02-25 20:46:59 -05:00
bf9ba39aa2
Merge branch 'release-1.34'
2020-02-25 18:22:55 -05:00
e630550d0f
bump version for release 1.34.4
2020-02-24 14:44:19 -05:00
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
300402013c
Merge branch 'master' into improve_filter_emails
2020-02-19 14:44:37 -05:00
ea2eba4110
bump version to 1.34.3
2020-02-19 13:50:27 -05:00
0c97bff645
monitor presets and controls for D-Link DCS-5020L
2020-02-19 22:50:09 +13:00
fc8f94c315
Merge branch 'master' into improve_filter_emails
2020-02-17 16:42:44 -05:00
af6b51f0d3
release 1.34.2
2020-02-04 16:47:33 -05:00
fb5111ffe4
bump version to 1.34.1 for release
2020-01-24 17:01:47 -05:00
259530fd3d
Add EmailTo,EmailSubject,EmailBody fields to Filter
2020-01-22 13:52:05 -05:00
d4bc0bf72b
bump version for release to 1.34.0
2020-01-15 17:31:06 -05:00
a84031f819
TEXT fields cannot have default values
2019-12-19 09:25:22 -05:00
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
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
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
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
f3f253c083
Query was renamed to Query_json
2019-09-28 11:55:28 -04:00
6bd2267483
Fix installing default filters failing due to missing values for AutoCopy and AutoCopyTo
2019-09-06 10:55:34 -04:00
6f59d63e08
Add missing AutoCopy and AutoCopyTo in db creation
2019-09-05 09:55:58 -04:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
962049fa31
Merge branch 'master' into filter_add_copy
2019-08-06 20:17:21 -04:00
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
57133691e9
Add update script for SecondaryStorageArea capability in Events and Filters
2019-07-24 10:53:23 -04:00
2d556e6402
Add SecondaryStorageId to Events
2019-07-24 10:52:32 -04:00
5b896b5e5c
Replace password('admin') with the resulting string because use of password is deprecated
2019-07-08 14:16:57 -04:00
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
19af25bf1a
add DecoderHWAccel fields to Monitors
2019-06-25 15:29:46 -04:00
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
a244af49ad
fix #2622 ( #2623 )
2019-05-28 10:57:01 -04:00
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -04:00
4027a5adf8
fix update script
2019-05-13 14:48:26 -04:00
87e407aa90
forgot to checkin update file
2019-05-13 10:31:09 -04:00
91b6d0103c
remove M typo
2019-05-11 13:41:19 -04:00
ae14be916c
initial plumbing to introduce token expiry and API bans per user
2019-05-11 13:39:40 -04:00
faaec9e1d6
Another attempt to fix SQL Control values ( #2600 )
2019-05-06 12:14:03 -04:00
75b4f4f2b3
Add a few missing GREATESTs in the triggers.
2019-04-30 17:29:18 -04:00
27344df373
fix typo
2019-04-30 07:15:00 -05:00
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
ff738a99ba
Enabling relative iris methods
2019-04-29 16:06:41 -04:00
077ad75516
Merge branch 'storageareas' into origin/zma_to_thread
2019-04-25 12:41:48 -04:00
3c56b32b08
Use GREATEST function prevent negative values in event counts
2019-04-24 10:38:08 -04:00
d776f63bd8
Change MonitorIds from TinyText to TEXT. Fixes #2569
2019-04-07 17:23:39 -04:00
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
b97801a174
Don't specify database name when turning off DEEP storage
2019-03-20 16:22:47 -04:00
71cd024fda
spacing updates. Use MP4 instead of H264/H265 in viewing codec dropdown
2019-03-19 12:16:31 -04:00
927071bb4d
Fix db update adding DefaultCodec
2019-03-19 11:08:14 -04:00
3f9564c10a
Merge branch 'master' into storageareas
2019-03-19 10:37:35 -04:00
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
d737e81e21
bump version for DefaultCodec in monitors
2019-03-06 14:57:05 -05:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
053289c4a0
rename eventserver to eventnotification
2019-02-27 09:27:50 -05:00
Isaac Connor
Isaac Connor
Arek Kossendowski
jahegu
makers-mark
hax0kartik
Dinko Bajric
zlodag
Isaac Connor
Isaac Connor
bluikko
Kirill Zhuykov
Pliable Pixels
Chris
Andrew Bauer
cnighswonger