bca4108396
Merge branch 'storageareas' into zma_to_thread
2020-02-22 17:58:30 -05:00
228acb8794
Merge branch 'master' into storageareas
2019-05-15 19:35:47 -04:00
1855ee441a
Fix #2609 invalid value horz instead of hori in orientations enumeration
2019-05-15 19:35:19 -04:00
c257fb46f6
Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas
2019-05-13 10:34:45 -04:00
e464888811
Merge branch 'runstate_in_state' into storageareas
2019-05-13 10:32:21 -04:00
7f704263d8
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup.
2019-05-13 10:30:41 -04:00
74d9f4f1aa
Spelling and grammar fixes in help ( #2603 )
...
* Edit Help array to make it match others below. This should not affect the results
* Misc. grammer and spelling fixes along with removing some duplicated words. This should not affect compilation.
* More grammer and spelling errors
* Replace Javascript with ZoneMinder because it did not make sense there.
* More spelling and grammar edits
2019-05-13 07:58:18 -04:00
74095963cc
Merge branch 'master' into storageareas
2019-05-12 19:39:09 -04:00
22c5d46c65
rescale audio packet duration and pts before feeding to codec after resample
2019-05-12 12:14:03 -04:00
d7daf8550f
Merge branch 'master' into storageareas
2019-05-12 09:37:41 -04:00
453bc2afd8
more frame dumping in resample
2019-05-12 09:36:26 -04:00
aada171440
clean up some logic in Analyse
2019-05-12 09:35:48 -04:00
d9f7e93df3
Fix typo gegress to degrees. Fixes #2601
2019-05-10 14:27:51 -04:00
67c20aa976
fix frame->duration to frame->pkt_duration
2019-05-10 12:58:54 -04:00
f67c00c29a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-05-10 12:31:27 -04:00
d3a680aaa3
Set out_frame duration when resampling. Better error message if failed to write to fifo
2019-05-10 12:31:10 -04:00
1498027f12
Add option to attach the objdetect image in emails
2019-05-08 22:45:04 -04:00
4c8a29e8d3
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-05-08 06:06:28 -04:00
3a7b49560a
spacing
2019-05-06 12:16:06 -04:00
faaec9e1d6
Another attempt to fix SQL Control values ( #2600 )
2019-05-06 12:14:03 -04:00
9469ce8c71
Merge branch 'section_length_when_modect' into storageareas
2019-05-06 10:50:41 -04:00
9ef912f2ba
add missing new event status info
2019-05-06 10:50:12 -04:00
5fe565b99d
spacing
2019-05-06 10:49:18 -04:00
1ca5eee53a
spacing
2019-05-06 10:45:40 -04:00
f0e5a435cf
spacing and quotes, but the main change is using aud_print instead of Info
2019-05-06 10:04:53 -04:00
50070a9a7c
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-05-03 14:59:14 -04:00
1e08b333b4
choose cur_dts instead of 0 for dts
2019-05-03 14:59:09 -04:00
4ecf41f2b4
Merge branch 'sort_packets' into storageareas
2019-05-03 14:58:34 -04:00
c91da4a7f5
if no packet found, still append to end
2019-05-03 14:58:29 -04:00
21999cf943
Merge branch 'sort_packets' into storageareas
2019-05-03 13:48:23 -04:00
aec8311deb
implement sorting incoming packets in the packetqueue
2019-05-03 13:48:05 -04:00
74bd812632
rpm packaging - buildrequire zlib-devel
2019-05-03 09:07:19 -05:00
63a970d49f
Merge branch 'fix_no_zlib' into storageareas
2019-05-03 09:42:06 -04:00
aaf4665909
Merge branch 'section_length_when_modect' into storageareas
2019-05-03 09:41:41 -04:00
f6b6daafab
close and reopen event when we hit section_length
2019-05-03 09:41:29 -04:00
fee95c2316
ifdef HAVE_ZLIB_H around code that uses Image->Zip
2019-05-03 09:04:31 -04:00
8733f89b29
eol f27 support
2019-05-02 20:09:15 -05:00
8b1565c41d
Change pid path to /run/zm/zm.pid instead of /var/run/zm/zm.pid. systemd now complains about the use of a legacy directory, so this quiets that.
2019-05-02 10:52:19 -04:00
91f7034642
Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas
2019-05-01 08:57:40 -04:00
25614bb75e
Merge branch 'master' into storageareas
2019-05-01 08:57:20 -04:00
ed02ef39f1
bump rpm specfile
2019-04-30 18:11:38 -05:00
75b4f4f2b3
Add a few missing GREATESTs in the triggers.
2019-04-30 17:29:18 -04:00
16de92e11c
Merge pull request #2591 from redaco/2590-netcat-onvif-authentication-support
...
Netcat ONVIF: adding ONVIF authentication
2019-04-30 07:17:06 -05:00
27344df373
fix typo
2019-04-30 07:15:00 -05:00
16697565bf
Netcat ONVIF: adding ONVIF authentication
2019-04-30 07:48:47 +02:00
c57017bd34
Merge pull request #2587 from connortechnology/update_triggers_prevent_negatives
...
Use GREATEST function prevent negative values in event counts
2019-04-29 18:30:47 -05:00
220a41dcf1
Merge pull request #2557 from cnighswonger/iris_control
...
Add camera relative iris control methods
2019-04-29 15:31:56 -05:00
ff738a99ba
Enabling relative iris methods
2019-04-29 16:06:41 -04:00
dfa997a989
Add camera relative iris control methods
...
This set of methods invoke realtive iris size in the direction indicated by
the <Large/Small> portion of their name. They accept no arguments.
NOTE:
This only just does work. The Dahua API specifies "multiples" as the input.
We pass in a 1 for that as it does not seem to matter what number (0-8) is
provided, the camera iris behaves the same.
2019-04-29 16:05:44 -04:00
76dd411341
Netcat ONVIF: Added support for "profile token" ( #2589 )
2019-04-29 15:56:55 -04:00
Isaac Connor
Isaac Connor
Jonathan Meredith
Chris
Andrew Bauer
Rémi Da Costa
cnighswonger
redaco