1ffa1cc33b
Add button update checks for AutoUnarchive
2020-10-12 10:56:01 -04:00
1854e02ab3
Accept both Id and filter[Id] when loading filters.
2020-10-12 10:55:42 -04:00
3fa0ef25f6
Add a link to the filter representing the events list
2020-10-12 10:55:03 -04:00
637551b7e7
Add english for FilterUnarchiveEvents
2020-10-12 10:54:38 -04:00
046124fe0e
Add AutoUnarchive column, also add Id to querystring if this is a saved Filter
2020-10-12 10:54:22 -04:00
4f5948cba0
Implement Unarchive action
2020-10-12 10:53:53 -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
ae506d94fa
Improve log line telling why we are going into alarm
2020-10-11 10:01:11 -04:00
03c8e86908
update some quotes
2020-10-10 11:09:51 -04:00
9e6db17e68
Fix getting next event due to case of asc
2020-10-10 11:09:39 -04:00
630d9011f3
Fix redirect when saving users
2020-10-10 09:48:09 -04:00
9768f081e4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-09 10:21:33 -04:00
268e364cfd
handle the paused case
2020-10-09 10:21:00 -04:00
9bfe8c28e4
Merge branch 'gcc_cpuid'
2020-10-09 08:48:01 -04:00
7d1598ae50
Merge branch 'master' into gcc_cpuid
2020-10-09 08:47:30 -04:00
cb38242917
use nullptr when appropriate
2020-10-08 16:46:47 -04:00
2f2562a876
init shared_data in the purpose=QUERY case to prevent crash. Also don't load zones if we don't need them
2020-10-08 16:46:30 -04:00
1aadeb2206
free the context as well.
2020-10-08 16:46:03 -04:00
871c556ac0
rename a variable to be more readable
2020-10-08 16:45:45 -04:00
1173f618ec
turn off negative pts detection... I have cameras that generate them all the time, they might actually be valid
2020-10-08 15:50:52 -04:00
71686fc1f2
fix case in mocord where cause would not contain motion
2020-10-08 15:50:12 -04:00
4afae7b738
More accurate seeking, remove debug and duplicated code. Correct type of curr_frame_id to match frame_count.
2020-10-08 11:13:18 -04:00
9cc7f0d360
Merge branch 'release-1.34'
2020-10-08 09:28:25 -04:00
86e744777c
Put back return on error
2020-10-08 09:12:37 -04:00
c28ff1f2b4
Include loading EndTime when loading Events data so that we can determine if an event is in-progress
...
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
7cc023c1ec
Update Event details when writing Frame Data. Write Frame Details when inserting a Bulk Frame
2020-10-07 18:37:38 -04:00
624006022c
Use a redirect to get rid of post on reload
2020-10-07 11:59:11 -04:00
95b09ad182
Add samesite=strict to all Cookie setting
2020-10-07 11:26:18 -04:00
b683d5326a
Test for empty array in htmlOPtions when notifying about not selecting a value
2020-10-07 11:22:42 -04:00
efd56a2e09
spacing
2020-10-07 11:16:02 -04:00
7f67d09749
test for monitorIds value before calling explode because explode will return an array with an empty first element instead of an empty array
2020-10-07 11:14:57 -04:00
faade3ea15
Enable dependencies for vnc monitor type in buster/focal and newer
2020-10-07 10:52:59 -04:00
991cf97890
Fix null=>undef
2020-10-06 17:08:47 -04:00
ae7ed5a342
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-06 16:51:24 -04:00
9abde9ee06
Merge branch 'release-1.34'
2020-10-06 16:51:12 -04:00
044ce61ddb
Always do event change detection whether we are paused or not. Because we might be single-stepping. Change progress to a double as that it what it should be.
2020-10-06 16:47:51 -04:00
d7429014b6
Convert progress to a double instead of int.
2020-10-06 16:36:56 -04:00
061c889394
Implement SEEK to offset using two 32bit integers to represent the double value
2020-10-06 16:35:46 -04:00
0e89d28c26
Send SEEK as two integers representing a float
2020-10-06 16:34:06 -04:00
de6a51ec15
Fix incorrect operator used for NOT IN and add IN operator to match php
2020-10-06 09:38:15 -04:00
90764ed62f
Merge pull request #3054 from PVi1/master
...
FIXED operand error for NOT IN SQL statement
2020-10-06 09:30:04 -04:00
69d393fc47
FIXED operand error for NOT IN SQL statement
...
Switched operand from !~ to ~[] for NOT IN SQL statement.
Web version was fine but zmfilter.pl suffered from this error.
2020-10-06 11:52:39 +02:00
87fd316e5b
makePopupButton removed, use makeButton instead
2020-10-05 16:40:14 -05:00
76af02cc76
whitespace
2020-10-05 16:31:26 -05:00
01596ec26c
whitespace
2020-10-05 15:53:46 -05:00
9c7ebf8c9e
unpopup video view
2020-10-05 15:44:07 -05:00
b27eac3cbf
Make centerCoord take a font size parameter to fix centering when using large font.
2020-10-05 16:12:48 -04:00
1c2dd92d31
Add LabelSize to get label_size from monitor
2020-10-05 16:12:33 -04:00
93ecb87caa
Clear the textframe before Annotating it.
2020-10-05 16:12:09 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Peter Vilhan
Andrew Bauer
Andrew Bauer