d27ff05980
Have to use CURRENT_TIMESTAMP as our times are not in UTC
2023-12-04 18:38:41 -05:00
0b79e832cf
Merge branch 'master' into remove_triggers
2023-12-04 09:32:10 -05:00
983ccb7afc
Add support for double in zmMemWrite
2023-12-03 10:37:53 -05:00
f373158d0a
Merge branch 'remove_triggers' into master
2023-12-01 09:33:18 -05:00
fd4d331515
Add code to update summary table on event delete.
2023-11-30 20:37:37 -06:00
2c2023d1d5
Remove intermediate event summary table references
2023-11-30 19:59:09 -06:00
4ff215e8bd
Fix for when system_utilisation is empty
2023-11-30 14:38:41 -05:00
c59aa1be23
Merge branch 'master' into remove_triggers
2023-11-20 13:57:16 -05:00
3627a4e97d
Add ZM_WEB_VIEWING_TIMEOUT config setting for each bw profile.
2023-11-20 13:25:26 -05:00
d62779b1e8
Include command that failed in Error.
2023-11-16 13:06:52 -05:00
939db57fa9
When command fails, log at Warning instead of Debug.
2023-11-16 13:06:29 -05:00
9ada194962
Merge branch 'master' into remove_triggers
2023-11-06 12:50:58 -05:00
b6bd1c93ad
Sort output of status by pid.
2023-10-31 09:59:02 -04:00
818eb5e0a3
Add a db ping to handle reconnection when zmupdate is running as a daemon. Move code around to be more efficient.
2023-10-27 11:08:22 -04:00
7596cdcde3
Change grep to match at beginning of line. The grep can show in the process list and so give us a broken result. Add debugging when we don't get a value.
2023-10-23 17:05:15 -04:00
eb6baf4365
Importance is an enum, default value should be Normal
2023-10-23 12:51:29 -04:00
eb291b76d1
Better log message when we have a weird value for Importance
2023-10-23 12:49:12 -04:00
e000fbb36c
Merge branch 'master' into remove_triggers
2023-10-19 22:19:45 -04:00
651fe2596f
Remove debug, add ETAGS subsitution. Fix not doing substitutions on the head of a summary email
2023-10-04 17:08:13 -04:00
582245cdaf
Rework new and find to properly handle multi-column primary keys
2023-10-04 17:07:50 -04:00
69e6c56ac3
Add Objects for Tag, Event_Tag and add functions to Event to load them.
2023-10-04 17:07:19 -04:00
3836e7d2a7
The value will be the Tag ID so compare against T.Id not T.Name
2023-10-04 15:57:54 -04:00
fc2198d375
Update Path after changing Storage Area
2023-10-04 10:07:07 -04:00
86e1959378
Use new ZM_PATH_UNAME instead of uname on PATH
2023-09-28 12:59:39 -04:00
87d29f10c6
Use new ZM_PATH_UNAME instead of uname on PATH
2023-09-28 12:59:28 -04:00
243edcc82f
Use new ZM_PATH_RM instead of hard coding path to rm
2023-09-28 12:59:08 -04:00
2a7b8a1dbb
Use https proxy instead of http since we now access an https url
2023-09-23 12:28:18 -04:00
e739b04a97
Add more debugging and event deleting when renumbering
2023-09-22 16:28:35 -04:00
92d3e00db1
Add GROUP BY E.Id to fix mysql complaining about teh aggregate function
2023-09-20 13:35:51 -04:00
25dfbf27f6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-09-18 17:05:56 -04:00
eea18b1663
Implement event renumbering in zmeventtool
2023-09-18 17:05:32 -04:00
82a7dca63b
SELECTING auto_increment value doesn't work. Must use mysql_insertid
2023-09-18 17:05:10 -04:00
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
f8c89a0405
Merge branch 'master' into tags
2023-09-14 16:42:06 -04:00
51612c058b
Merge branch 'master' into remove_triggers
2023-09-09 18:11:28 -04:00
bf34db7da2
Log a warning when failed to send an email
2023-09-09 12:04:57 -04:00
f281113e2a
Merge branch 'master' into remove_triggers
2023-09-05 12:07:21 -04:00
88a746981f
Fix save not applying passed in new values
2023-09-05 12:05:39 -04:00
d588669321
Log a warning when failed to send an email
2023-09-05 12:05:03 -04:00
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
6fd119157a
Text corrections
2023-08-27 02:00:59 +02:00
00b4ed120c
Merge branch 'master' into remove_triggers
2023-08-21 18:00:49 -04:00
61d0cec1fa
Debug the result of the auth header split, not the same line over and over
2023-08-18 16:56:37 -04:00
e163509d57
auto_reconnect id deprecated.
2023-08-16 09:53:07 -04:00
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
769f6ce372
Only set channel from the default (1) if ControlDevice is populated
2023-08-08 13:28:18 -04:00
206be0ea96
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-08-02 13:36:33 -04:00
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
f1b3bc08c1
Use opendir instead of glob when copying files. For performance reasons.
2023-08-02 13:27:45 -04:00
54000bc204
Reduce redundant debugging
2023-08-02 13:05:57 -04:00
Isaac Connor
Isaac Connor
Aaron Kling
Simpler1
Alejandro Criado-Pérez