Isaac Connor
|
cc1368ba2c
|
Move code for AVPixFormat to .cpp instead .h. Add const's so we can use it on cost Image * vars
|
2022-03-26 20:31:33 -04:00 |
Isaac Connor
|
f17ca48cab
|
Default end_time to start_time on event creation so that we don't get a negative duration
|
2022-03-26 12:47:46 -04:00 |
|
Isaac Connor
|
9f404f7b97
|
Add test for event before calling event->Duration.
|
2022-03-26 12:47:26 -04:00 |
|
Isaac Connor
|
1c9c3d34f5
|
Free up raw images early when not recording also. Also free up decoded frame ram
|
2022-03-25 13:50:12 -04:00 |
|
Isaac Connor
|
8458eb741a
|
Don't store keyframes in packetqueue if we are not recording at all.
|
2022-03-25 12:26:05 -04:00 |
|
Isaac Connor
|
2b8fee80de
|
escape html in Storage names
|
2022-03-21 16:06:52 -04:00 |
|
Isaac Connor
|
99e78debf5
|
Use shared_data->analysing instead of analysing in tests since we could be disabled by zmu.
|
2022-03-21 15:58:01 -04:00 |
|
Isaac Connor
|
0850e0db70
|
Remove Enabled test, replace with Capturing and Recording tests
|
2022-03-21 15:56:16 -04:00 |
|
Isaac Connor
|
531793276f
|
Fix auth'd user information being saved to session before switching session id's leaving bogus authenticated user in previous session.
|
2022-03-21 15:31:44 -04:00 |
|
Isaac Connor
|
08598ace6b
|
remove space
|
2022-03-20 19:13:46 -04:00 |
|
Isaac Connor
|
965e256bbc
|
remove space
|
2022-03-20 19:13:46 -04:00 |
|
Isaac Connor
|
ed41e63980
|
Can't treat anlysing as a boolean because ANALYSING_NONE==1. Should fix zm oing motion detection when set to NONE
|
2022-03-20 19:13:46 -04:00 |
|
Isaac Connor
|
23aa41091f
|
Add Trigger/etc to onMotion recording option
|
2022-03-20 19:13:46 -04:00 |
|
Isaac Connor
|
b67185fe9c
|
Fix alignment on Capture Method
|
2022-03-20 19:13:46 -04:00 |
|
Isaac Connor
|
13f403c56e
|
fix eslint
|
2022-03-13 08:47:11 -04:00 |
|
Isaac Connor
|
9aeeb58014
|
Fix missed Function => Capturing == None
|
2022-03-13 08:37:33 -04:00 |
|
Isaac Connor
|
6aeb163cba
|
Fix lock around terminate
|
2022-03-13 08:37:33 -04:00 |
|
Isaac Connor
|
c6a1a4ff0e
|
Fix potential XSS from Username
|
2022-03-13 08:34:44 -04:00 |
|
Isaac Connor
|
48d3526459
|
Fix potential XSS from Username
|
2022-03-13 08:19:12 -04:00 |
|
Isaac Connor
|
550693af10
|
Add a pattern to prevent invalid username characters
|
2022-03-10 14:10:31 -05:00 |
|
Isaac Connor
|
07aa171c04
|
Output valid html only for Username to prevent XSS
|
2022-03-10 14:10:04 -05:00 |
|
Isaac Connor
|
f49601a173
|
Add filtering to Username to prevent XSS
|
2022-03-10 14:09:41 -05:00 |
|
Isaac Connor
|
c395d46cc8
|
Split options into Capturing, Analysing, Recording tabs
|
2022-03-10 13:54:38 -05:00 |
|
Isaac Connor
|
b103072b7e
|
Cleanup code a bit moving variable declarations around to where they are used and removing duplicated curl free.
|
2022-03-10 12:24:00 -05:00 |
|
Isaac Connor
|
5dc4e5ddb4
|
Fix compile warning. Rename variables to be more descriptive and remove unused ones
|
2022-03-10 12:09:02 -05:00 |
|
Isaac Connor
|
4b03b0a1a6
|
Merge pull request #3454 from gonzalezcalleja/fix_zmpkg_status
Fix zmpkg status
|
2022-03-09 15:58:02 -05:00 |
Javier Gonzalez
|
6a2d0fa81a
|
Fix
|
2022-03-09 21:14:25 +01:00 |
|
Javier Gonzalez
|
224d275950
|
Fix
|
2022-03-09 21:13:34 +01:00 |
|
Javier Gonzalez
|
3d093ed8a6
|
Fix monitor not change status when zoneminder state change
|
2022-03-09 21:07:39 +01:00 |
|
Isaac Connor
|
e84b82df18
|
Merge pull request #3453 from gonzalezcalleja/add_recording_status
Show recording status to console
|
2022-03-09 14:44:38 -05:00 |
|
Isaac Connor
|
d76f2e4b0b
|
Merge pull request #3452 from gonzalezcalleja/fix_zmpkg_capturing
Fix zmpkg recording status
|
2022-03-09 14:42:18 -05:00 |
|
Javier Gonzalez
|
cc3b5421f5
|
Adding recording status to console
|
2022-03-09 19:59:21 +01:00 |
|
Javier Gonzalez
|
4a1dbc884d
|
Fix zmpkg recording status
|
2022-03-09 19:40:04 +01:00 |
|
Isaac Connor
|
e943f0a411
|
Merge pull request #3450 from gonzalezcalleja/fix_zmpkg
Fix when using a custom state with zmpkg.pl
|
2022-03-08 11:21:00 -05:00 |
|
Javier Gonzalez
|
858ab62fc4
|
Fix when using a custom state
|
2022-03-08 17:10:29 +01:00 |
|
Isaac Connor
|
05b5ca9b15
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-03-08 09:06:37 -05:00 |
|
Isaac Connor
|
0785e3571c
|
code style, remove duplicated code.
|
2022-03-08 09:06:31 -05:00 |
|
Isaac Connor
|
a748b0ed0a
|
When connecting to a monitor, if it fails, disconnect. This should fix a bug in zmtrigger and others where it would never reconnect. The idea is that we asked for a successful connection, if it failed, we shouldn't be in a failed connected state, we should be disconnected.
|
2022-03-08 09:06:06 -05:00 |
|
Isaac Connor
|
8fe0cb5e33
|
tidy up the mem_info hash and turn into a hash instead of a pointer to a hash. Check for validity flah before checking sizes. Improve debug logging.
|
2022-03-08 09:04:41 -05:00 |
|
Isaac Connor
|
b13fd68376
|
Merge pull request #3449 from jp-bennett/master
Add rtsp_quirk to Janus mountpoints.
|
2022-03-05 12:48:47 -05:00 |
Jonathan Bennett
|
9f4df40ac5
|
Add rtsp_quirk to Janus mountpoints.
Workaround for Vivotek and possibly other cameras that use nonstandard RTSP URIs,
|
2022-03-04 20:40:56 -06:00 |
|
Isaac Connor
|
10402fdabe
|
Use template backticks for the Notes string to handle multi-line
|
2022-03-04 13:41:19 -05:00 |
|
Isaac Connor
|
8db08f5a10
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-03-04 12:09:44 -05: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
|
1fb42d0b77
|
Change api of selectLayout. Now takes a value. use MonitorStream.setScale to set image scale. In general fix behaviour when switching between fixed sizes, scales and layouts
|
2022-03-04 12:08:29 -05:00 |
|
Isaac Connor
|
920f5470a8
|
Don't set width&height on img. img is always 100% of container. Don't show zoom unless it is != 1.0. Only update buttons if there is a change, to reduce redraws
|
2022-03-04 12:07:32 -05:00 |
|
Isaac Connor
|
0c31e35b4e
|
Add classes to fields of monitor status so we can style them as needed
|
2022-03-04 12:06:49 -05:00 |
|
Isaac Connor
|
9b9746113e
|
If we asked for stream, keep streaming even not decoding or other problem. We will wait for the situation to change
|
2022-03-04 12:06:24 -05:00 |
|
Isaac Connor
|
5b9ca3f164
|
Merge pull request #3447 from jp-bennett/master
Adds support for Janus 1.x
|
2022-02-28 20:49:56 -05:00 |
|
Jonathan Bennett
|
c28c043773
|
Adds support for Janus 1.x
|
2022-02-28 18:05:17 -06:00 |