Commit Graph

1083 Commits (master)

Author SHA1 Message Date
Isaac Connor 2e10169cde Deprecate cURL monitor type 2023-09-21 12:08:27 -04:00
Simpler1 18d74ed7ac (feat): Tags
fix(tag): Create tags on mobile

chore(tags): Change TagName to Name

chore(tags): eslint

chore(tags): dbFetchAll to dbQuery for removetag

chore(events): eslint (attempt 2)

feat(tags): Better handling of keyboard

fix(tags): Enter key for creating new tag

fix(tags): Don't allow space as a tag name

feat(tags): Delete tag if last assignment removed

fix(tags): Increase height of dropdown

in progress

fix(Tags): Use T.Id on the events page dropdown

fix(Tags): Remove $availableTags from events.php

chore(sql): Formatting sql statements

feat(Tags): Working OR on filters and events pages

fix(filter): Populate availableTags

chore(Tags): code formatting

fix(tag): Add tag on create tag

Fix(tags): Remove tag from available if last

feat(tags): Add zm_update.sql

fix(chosen): Undo css width

fix(chosen): tags dropdown width

fix(tags): dropdown over timeline

fix(tags): Full width input

fix(events): Refresh table on page show

chore(filter): Clean up availableTags

chore(event): Clean up available & selected Tags

fix(event): Update available tags on remove

fix(event): Remove hack for selected tags

feat(tags): Blur input after adding tag

doc(tags): Initial tags documentation

fix(tags): Dark theme dropdown

fix(tags): Dark theme for tags on input

fix(tags): Dark theme for highlight in dropdown

fix(tags): Populate filter tags droplist

chore(): Bump zm_update to 1.37.42

chore(tags): Move mobile check to skin.js

chore(tags): Comment debug statements

fix(tags): Enter key to create tag on mobile Chome

chore(tags): Space in 'All Tags' for translation

Temporary commit to handle cookie expiration times

chore(tags): Remove unnecessary Tag(s) from en_gb

chore(): Cleanup unnecessary Error and Debug

chore(): Resolve merge conflicts

chore(): Address merge conflicts with master
2023-08-31 15:50:08 -04:00
Isaac Connor 79b755047a Add db update to correct column type of Longitude in Events and Servers table 2023-08-25 12:49:14 -04:00
Jonathan Bennett 5c9588c012 Adds RTSP2Web support for live view 2023-07-29 23:46:31 -05:00
Isaac Connor b002ae18b5 Use syntax that works on mysql <8 2023-07-13 13:19:07 -04:00
Isaac Connor bdb0768dfe Bump to 1.37.41 to get a db update to correct the case of ONVIF_Alarm_Text 2023-07-12 17:48:20 -04:00
Isaac Connor 37c39386ee Correct casing of ONVIF_Alarm_Text 2023-07-11 18:24:58 -04:00
Isaac Connor 7ebca529b5 Put back copying over generated .sql files. They don't get included with *.sql 2023-06-21 18:59:43 -04:00
Isaac Connor d2fb365fa9 Add the ability to send a single summary email instead of individual emails per event 2023-04-24 17:53:16 -04:00
Isaac Connor 6aba77a6f0 Add Ubiquiti to Manufacturers 2023-04-22 13:33:18 -04:00
Isaac Connor e15d1f7e5b Add Deleted column to Monitors 2023-04-19 18:25:45 -04:00
Isaac Connor 8c923aa0be Put back zm_create.sql 2023-04-10 15:48:20 -04:00
Isaac Connor c30a40912e Remove reference to MonitorIds column of users table. Fixes #3679 2023-03-23 11:20:30 -04:00
Isaac Connor 821bfa9625 Fix typo 2023-03-22 13:28:35 -04:00
Isaac Connor c8802623e4 Install all sql instead of naming individual files 2023-03-22 13:28:27 -04:00
Isaac Connor 5d63d4f375 Rough in User_Preferences table in db 2023-03-21 10:03:57 -04:00
Isaac Connor fa9a0e45b7 Add CpuUserPercent and CpuSystemPercent to System_Stats 2023-03-01 13:42:21 -05:00
Isaac Connor 75f0ee82e5 Add Name, Email, Phone to Users 2023-02-28 14:01:28 -05:00
Isaac Connor defba5d53e Add Name, Email, Phone to Users 2023-02-28 14:01:22 -05:00
Isaac Connor dc2df16328 Add column Decoder to Monitors 2023-02-26 15:52:13 -05:00
Isaac Connor b0413f330e Merge branch 'map' 2023-02-25 12:44:28 -05:00
Isaac Connor 25a7159393 Allow ServerId to be NULL, which is the case in a non-multi-server install 2023-02-18 18:02:15 -05:00
Isaac Connor 0879252d13 Add Server Stats table and insert into it in zmstats.pl 2023-02-18 18:02:15 -05:00
Isaac Connor d9862bb18e Remove FOREIGN KEYS on Events table for performance/reliability 2023-02-02 10:40:57 -05:00
Isaac Connor 4f59644f49 Default API to enabled for admin user 2023-01-31 10:07:16 -05:00
baudneo 7590cf8691
SQL: Add base and provide upgrade file
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
2023-01-09 17:57:25 -07:00
Isaac Connor 7a122f7367 Add SectionLengthWarn to Monitors table 2023-01-07 12:34:30 -05:00
Isaac Connor 873213559d Fix logic inversion 2022-12-24 09:18:04 -05:00
Isaac Connor 5d87ffeac2 Fix missing ` 2022-12-24 09:16:49 -05:00
Isaac Connor 5fc37c050a Add Latitude and Longitude to Servers and Events 2022-12-22 10:00:23 -05:00
Isaac Connor 8fe28a5cc2 Fix errors due to ' 2022-12-15 16:03:48 -05:00
Isaac Connor 2f7551769a Add 1.37.28 db update file to rename Snapshot_Events to Snapshots_Events 2022-12-14 08:29:51 -05:00
Isaac Connor 83b6ae37a9 Deal with missing monitors by dropping the foreign key and adding it back after creating Monitor Permissions 2022-11-19 07:47:09 -05:00
Isaac Connor 6f8ce1343f Fix Monitor Permission updating. If monitors are specified, they default to View even if MOnitors is set to None. 2022-11-15 15:00:27 -05:00
Isaac Connor f37786bb2a Remove quotes from line inserting values into Monitor_Permissions 2022-11-03 16:57:16 -04:00
Isaac Connor 12d5748c1c Fi test for Groups_Permissions_GroupId_UserId_idx 2022-11-03 11:14:23 -04:00
Isaac Connor 20f01b6953 Remove command to drop Groups_Permissions 2022-11-03 09:30:07 -04:00
Isaac Connor 5106d2aaa4 Move db updates for Groups and Monitor Permissions into place, and bump version it gets picked up 2022-11-03 07:49:44 -04:00
Isaac Connor 6265a1ca41 Move from MonitorIds to Monitor_Permissions and Group_Permissions. 2022-11-02 13:25:43 -04:00
Isaac Connor 7ff928dcf8 Make the primary index on Groups_Permissions a unique index to ensure that the GroupId/UserId mapping is unique. Add Monitor_Permissions 2022-11-02 13:24:26 -04:00
Isaac Connor 893b86ee96 Make the primary index on Monitors_Permissions a unique index to ensure that the MOnitorId/UserId mapping is unique. 2022-11-02 13:24:26 -04:00
Isaac Connor 76f804dadd Add Permission enum to Groups_Permissions 2022-11-02 12:37:16 -04:00
Isaac Connor 3775be599e Add Groups_Permissions table 2022-11-02 12:36:42 -04:00
Isaac Connor cd4a9fbb98 Merge ../ZoneMinder.connortechnology 2022-10-31 18:01:04 -04:00
Isaac Connor 1c38e79c1b Add Reports table. Also set ENGINE for other tables that were hard coded to InnoDb. Fixes #3615 2022-10-31 09:29:50 -04:00
Isaac Connor f0a1a1b0ee Merge branch 'master' into add_event_data 2022-10-27 17:08:12 -04:00
Isaac Connor a25436369f Add db update to create Event_Data table 2022-10-27 14:17:24 -04:00
Isaac Connor ac55528f8f Untested change to use TIMESTAMP instead of DATETIME for Monitor_Status/UpdatedOn. This is for mysql 5.5. 2022-10-27 10:56:11 -04:00
Isaac Connor 196ae7cf89 Add UpdatedOn field to Monitor_Status 2022-10-12 19:12:36 -04:00
Isaac Connor d1cd7d3f91 Merge branch 'master' into add_janus_rtsp_user 2022-09-14 18:34:07 -04:00
Isaac Connor f5ad68143c Add Janus_RTSP_USer to Monitors 2022-09-12 10:33:51 -04:00
Isaac Connor e24432ee4d Merge branch 'master' into reports 2022-08-30 19:40:14 +02:00
Isaac Connor 85e897f211 move generic update script to version specific 2022-08-25 20:33:58 -04:00
Isaac Connor 29750a56e7 Merge branch 'master' into add_mqtt 2022-08-25 18:37:54 -04:00
Jonathan Bennett d41792ae00 Adds Janus options Profile-ID Override and Use RTSP Restream to work around camera issues 2022-08-09 00:54:41 -05:00
Isaac Connor 5405ebdaa8 Replace the Event index with an eventId,ZoneId index, which mysql will actually use to speed up the subquery for AlarmedZone 2022-08-05 10:53:25 -04:00
Isaac Connor b4000ef0c7 Add Reports table creation 2022-08-04 09:34:06 -04:00
Doug Nazar a34db8bc38 Don't hardcode db in upgrade script. 2022-07-27 12:25:57 -04:00
Isaac Connor a3395df49f Rename ONVIF_Alarm_Txt to ONVIF_Alarm_Text 2022-07-23 16:07:45 -04:00
Isaac Connor d2d5b6e489 Add ONVIF_Alarm_text to zm_create.sql 2022-07-23 16:07:13 -04:00
ovargasp 981769b9db
Allows users to set an specific "Onvif alarm text" for each monitor (#3535)
* Allows users to set an specific "Onvif alarm text" for each monitor

With this personalization the cameras that use strings different to "MotionAlarm"
such as Dahua, will be able to process their Onvif alarms. To make it easier, the change
sets a default "Alarm Text"  value for it to work out of the box and then allows to
modify it according to the particular necessities of each brand. It consists of
a new column on table Monitors, changes on Monitors.h, Monitors.cpp and a change
on UI to manage the value of Alarm Text per camera.

Updated es_la.php language file.

Co-authored-by: ovargasp <ovargasp@hoitmail.com>
2022-07-20 12:51:13 -05:00
Isaac Connor a617a70620 Add UserId to MontageLayouts 2022-07-12 17:33:34 -04:00
Isaac Connor b298b46b5e Add UserId to MontageLayouts 2022-07-12 17:30:25 -04:00
Isaac Connor 223a46393e Add AnalysisImage to Monitor 2022-06-15 11:34:20 -04:00
Isaac Connor 61fc107808 Fix Analysis remaining turned on for Monitor and NoDect 2022-05-17 14:03:04 -04:00
Isaac Connor 997c1197cf Implement decoding=Keyframes + OnDemand 2022-05-10 14:25:34 -04:00
Isaac Connor e297bfcfd4 Add System to Config table 2022-05-04 12:58:14 -04:00
Isaac Connor 1852694a50 Add webm to output containers 2022-04-29 18:39:54 -04:00
Isaac Connor 32109697d2 Add update for add Decoding to Monitors 2022-03-28 16:22:18 -04:00
Isaac Connor a6193bba0e Fill in Protocol of HikVision control 2022-03-28 14:40:21 -04:00
Isaac Connor 08332c9be5 add update file for MQTT columns 2022-03-21 16:09:29 -04:00
Isaac Connor d8a2d712b5 Put back MQTT_Enabled in Monitors 2022-03-21 16:09:29 -04:00
Isaac Connor b23842021c Add MQTT_Subscriptions to Monitors 2022-03-21 16:08:13 -04:00
Isaac Connor 69856f2b8c Delete zm_update-1.37.multistream.sql asit has been merged to 1.37.12 2022-03-04 12:09:41 -05:00
Isaac Connor 7ef9824736 Handle NoDect case 2022-02-28 09:11:48 -05:00
Isaac Connor 3b9d13eb8e rename to 1.37.12 and add missing updates for other functions 2022-02-27 14:16:40 -05:00
Isaac Connor 10e39b3b13 :wqMerge branch 'master' into replace_function_concept 2022-02-02 17:08:01 -05:00
Isaac Connor e69095a9b4 Fix == to = 2022-02-01 17:22:23 -05:00
Isaac Connor 23bfbcd6ce Merge branch 'master' into multistream 2022-01-26 10:13:20 -05:00
Jonathan Bennett ec9403fb6f Adds Amcrest On-camera Motion Detection 2022-01-25 22:38:00 -06:00
Isaac Connor 35efb111ac Add Private to Config 2022-01-22 12:30:59 -05:00
Jonathan Bennett fb832e7d1b Adds janus_enable_audio, a switch to try to enable audio in live stream viewing. 2022-01-19 00:14:52 -06:00
Isaac Connor 3835087c9d Merge branch 'master' into multistream 2022-01-18 20:16:08 -05:00
Isaac Connor 71c7b324e9 Update new Capturing, Analysing, Recording based on Function. 2022-01-11 12:01:07 -05:00
Jonathan Bennett 3a9c16aeea First working Janus build 2022-01-10 23:22:37 -06:00
Isaac Connor fd3a70172d Merge branch 'master' into multistream 2022-01-10 17:51:50 -05:00
Isaac Connor 701045393c fix typo 2022-01-10 09:07:59 -05:00
Jonathan Bennett 1333d8c751 Adds ONVIF Motion Detection Support 2022-01-06 16:45:15 -06:00
Isaac Connor aefed4e174 Merge branch 'master' into multistream 2022-01-05 18:03:44 -05:00
Isaac Connor 6bd04de5f6 Merge branch 'master' into multistream 2021-12-31 17:53:36 -05:00
Isaac Connor f9f8764507 Change Event->Cause to a TEXT instead of varchar(32) because we now inclue Alarmed Zone name and could include other info as well.
Fixes #3403
2021-12-28 12:33:03 -05:00
makers-mark 9733cdb576
Update zm_update-1.35.25.sql 2021-12-13 21:07:35 -05:00
Isaac Connor e2df6e5074 Add ExecuteInterval to Filters 2021-12-13 15:00:03 -05:00
Isaac Connor 072d181f79 Fix AlarmStartCommand => EventStartCommand 2021-11-29 13:49:07 -05:00
Isaac Connor ea6a84ae66 Fix AlarmEndCommand => EventEndCommand 2021-11-29 13:49:07 -05:00
Isaac Connor d51eb63947 Add EventStartCommand and EventEndCommand to monitors table 2021-11-26 19:21:24 -05:00
Isaac Connor 0a30c55042 install manufacturers.sql and models.sql 2021-11-18 11:09:49 -05:00
Isaac Connor f63c124988 include manufacturers and models 2021-11-18 09:55:39 -05:00
Isaac Connor 18610fd601 Add an update script that includes manufacturers and models 2021-11-18 09:55:19 -05:00
Isaac Connor f48511acba Add NULL for ModelId column when adding MonitorPresets. 2021-11-16 09:19:42 -05:00