mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-01-01 18:57:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
22,989 Commits 43 Branches 101 Tags
floorplan
Commit Graph

1316 Commits

Author SHA1 Message Date
Isaac Connor
3627a4e97d Add ZM_WEB_VIEWING_TIMEOUT config setting for each bw profile. 2023-11-20 13:25:26 -05:00
Isaac Connor
d62779b1e8 Include command that failed in Error. 2023-11-16 13:06:52 -05:00
Isaac Connor
939db57fa9 When command fails, log at Warning instead of Debug. 2023-11-16 13:06:29 -05:00
Isaac Connor
eb6baf4365 Importance is an enum, default value should be Normal 2023-10-23 12:51:29 -04:00
Isaac Connor
eb291b76d1 Better log message when we have a weird value for Importance 2023-10-23 12:49:12 -04:00
Isaac Connor
582245cdaf Rework new and find to properly handle multi-column primary keys 2023-10-04 17:07:50 -04:00
Isaac Connor
69e6c56ac3 Add Objects for Tag, Event_Tag and add functions to Event to load them. 2023-10-04 17:07:19 -04:00
Isaac Connor
3836e7d2a7 The value will be the Tag ID so compare against T.Id not T.Name 2023-10-04 15:57:54 -04:00
Isaac Connor
fc2198d375 Update Path after changing Storage Area 2023-10-04 10:07:07 -04:00
Isaac Connor
87d29f10c6 Use new ZM_PATH_UNAME instead of uname on PATH 2023-09-28 12:59:28 -04:00
Isaac Connor
243edcc82f Use new ZM_PATH_RM instead of hard coding path to rm 2023-09-28 12:59:08 -04:00
Isaac Connor
92d3e00db1 Add GROUP BY E.Id to fix mysql complaining about teh aggregate function 2023-09-20 13:35:51 -04:00
Isaac Connor
25dfbf27f6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-09-18 17:05:56 -04:00
Isaac Connor
82a7dca63b SELECTING auto_increment value doesn't work. Must use mysql_insertid 2023-09-18 17:05:10 -04:00
Isaac Connor
b22ef6f328 Use a subselect instead of join because newer mysql doesn't like the aggregate functions without telling it how to group the other columns 2023-09-18 09:59:46 -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
Alejandro Criado-Pérez
6fd119157a Text corrections 2023-08-27 02:00:59 +02:00
Isaac Connor
61d0cec1fa Debug the result of the auth header split, not the same line over and over 2023-08-18 16:56:37 -04:00
Isaac Connor
e163509d57 auto_reconnect id deprecated. 2023-08-16 09:53:07 -04:00
Isaac Connor
5b7defb57b Remove warnings about ControlDevice, because that is now channel. Detect duration not being in microseconds and adjust. 2023-08-15 14:02:12 -04:00
Isaac Connor
769f6ce372 Only set channel from the default (1) if ControlDevice is populated 2023-08-08 13:28:18 -04:00
Isaac Connor
206be0ea96 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-08-02 13:36:33 -04:00
Isaac Connor
1628c4fa6b Handle term->val not being defined, and fix the code to strip quotes from the value. 2023-08-02 13:28:44 -04:00
Isaac Connor
f1b3bc08c1 Use opendir instead of glob when copying files. For performance reasons. 2023-08-02 13:27:45 -04:00
Isaac Connor
54000bc204 Reduce redundant debugging 2023-08-02 13:05:57 -04:00
Jonathan Bennett
5c9588c012 Adds RTSP2Web support for live view 2023-07-29 23:46:31 -05:00
Isaac Connor
bd71b35403 Handle RateControl being undef 2023-07-27 11:47:02 -04:00
Isaac Connor
b3fb68b293 Fix test for undef 2023-07-25 13:24:57 -04:00
Isaac Connor
0134f8e447 Change detect_realm to return empty string instead o f undef. Just so that realm is always a string and not undefined. Fix integer comparison on strings and make detect_realm succeed as long as response isn't 401. 2023-07-24 12:42:20 -04:00
Isaac Connor
40516598fa Fix errant ` 2023-07-12 17:45:33 -04:00
Isaac Connor
3e3d628fa1 Sync up missing fields in Monitor class. Add code for Manufacturer and Model 2023-07-11 17:27:08 -04:00
Isaac Connor
efb27298c1 Rough in classes for Manufacturer and Model 2023-07-11 17:26:49 -04:00
Isaac Connor
93031e86d8 Add latitude and longitude to shmem 2023-07-09 12:03:51 -04:00
Alejandro Criado-Pérez
871bf1772f fix: messages 2023-07-05 01:03:48 +02:00
Isaac Connor
2aa5de8d51 Sync up with zm_utils version 2023-06-10 12:19:52 -04:00
Isaac Connor
66d7f88edf Clean up help text for ZM_LOG_DEBUG_FILE to not say that it can include a directory. It should be JUST a filename. 2023-06-09 17:27:54 -04:00
Isaac Connor
93ddf51cd7 Use ControlDevice for ChannelId. Update realm detection in PutCmd. Mostly debugging to see why a second put fails auth. 2023-06-01 10:00:51 -04:00
Isaac Connor
3c0bb3a7a0 Clean up realm usage, add some more debugging 2023-05-25 13:54:24 -04:00
Isaac Connor
6b415f5d55 Remove redundant request in PutCmd 2023-05-24 14:42:13 -04:00
Isaac Connor
c0e66644e9 Update Netcat to support Digest Auth, and fix bad cutnpaste 2023-05-17 19:12:36 -04:00
Isaac Connor
447e411aa7 Add getting username/password/address from Path instead of ContrnolAddress 2023-05-14 19:28:40 -04:00
Isaac Connor
d81a8a9c9c Add Deleted to Monitor perl object 2023-04-25 13:51:53 -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
9b8dd156be Update s3 support, moving it into the storage object. 2023-04-22 09:54:13 -04:00
Isaac Connor
cb8ec708fc Add support for aws_bucket and subpath 2023-03-23 10:28:58 -04:00
Isaac Connor
d2751a7254 Move s3 object creation code to a sub s3 in storage so it gets cached. 2023-03-23 10:03:14 -04:00
Isaac Connor
7779af74ad Populate missing serial field in Storage class 2023-03-19 11:31:12 -04:00
Isaac Connor
440ec48653 Must detaint rows and replace all ? with %s 2023-03-07 08:11:00 -05:00
Isaac Connor
e82451f2bb Add ZM_WEB_HOMEVIEW option 2023-03-05 10:21:04 -05:00
Isaac Connor
5280c423bb Add comment explaining cpuload values 2023-03-01 14:08:28 -05:00