bfb7238edb
Merge branch 'master' into hwdecode
2019-06-25 09:09:57 -04:00
c3135accbb
Make events close on a section length time boundary only if event_close_mode == CLOSE_TIME. When an alarm happens in event_close_mode==ALARM, close the continuous event regardless of the # of pre-event frames in the event. Add some debugging
2019-06-24 21:11:52 -04:00
246b4cb9d1
working hwdecode
2019-06-24 17:22:59 -04:00
529f0b55ef
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-24 13:13:57 -04:00
2d80283844
simplify some logic in Analyze and prevent segfault when we close continuous event to start alarm event
2019-06-24 13:13:46 -04:00
8cf7563ce4
fix merge
2019-06-24 12:00:19 -04:00
148a48a861
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2019-06-24 11:59:08 -04:00
ee19322e11
update do_debian_package from storageareas
2019-06-24 11:57:52 -04:00
1815bf18a9
Add support for specifying PPA
2019-06-24 11:55:38 -04:00
46c19c7efb
fix for zone overlay scaling issues in montage ( #2643 )
...
* remove extra px in svg tag
* add js method to track liveStream img size for zones
* switch to using SVG scaling to deal with zone polygons
* update jsdoc for eslint
* fix blank lines eslint issue
2019-06-24 11:45:40 -04:00
9a353d0b6d
don't set frame size
2019-06-24 11:44:21 -04:00
44e4d93445
Merge branch 'master' into storageareas
2019-06-24 11:35:36 -04:00
6ed0074077
End continuous events on alarm ( #2644 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* add update script to add MinSectionLength
* Add min_section_length to enforce a minimum event length when closing continuous events on alarm
2019-06-24 11:29:00 -04:00
299f994506
Fix zmcrypt message ( #2645 )
...
* added more clarity on zm_crypt authentication errors
* fixed variable name
2019-06-24 11:28:32 -04:00
dab9544845
Revert audio sync fixes ( #2646 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* Revert the work I did to srt packets by dts after changing their time_base. It doesn't work. Instead since dts doesn't actually matter to playback, only ffmpeg storing, munge it to whatever is neccessary to make ffmpeg happy.
2019-06-24 11:27:47 -04:00
9713d908fb
Spacing, google code style and tabs to spaces
2019-06-24 10:28:11 -04:00
73b5d506b4
Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
2019-06-24 09:33:54 -04:00
82672d9b86
stop bcrypt files from installing with zm
2019-06-23 13:20:08 -05:00
00183b535a
rename bcrypt to libbcrypt to reflect name of the project
2019-06-23 12:56:04 -05:00
645d13c752
bump rpm specfile to 1.33.9
2019-06-23 12:16:15 -05:00
8b37c0e9b0
remove bcrypt & jwt-cpp as submodules, bring in statically under src
2019-06-23 12:12:12 -05:00
46032385fe
fix viewport on mobile. Fix duplicated css when selected css is base
2019-06-22 14:10:55 -04:00
38bcdbbffe
ONly close session if we opened it in generateAuthHash, only try to validate auth hash if it is set in the session
2019-06-21 18:04:39 -04:00
85b9b045cc
Copy Profile Token to ControlDevice for use with Netcat PTZ script
2019-06-21 12:42:26 -04:00
60618d5998
Fix hour subtraction in getAuthUser to actually subtract an hour
2019-06-21 11:45:33 -04:00
ad1df8f80a
log the response if command fails, and add missing uthentication sections
2019-06-21 11:40:46 -04:00
5a0b30efd5
escape $
2019-06-21 10:19:48 -04:00
55d98e4a9f
fix crash
2019-06-20 15:56:25 -04:00
470da03322
Merge sync fixes from storageareas
2019-06-20 15:14:20 -04:00
f6960726b8
Don't check cause.length because we know it hasn't been used yet. check event_close_mode before closing the continuous unalarmed event
2019-06-20 15:12:32 -04:00
36995de96f
Alter option help for EVENT_CLOSE_MODE to reflect that alarm will end the continuous event and start a new one
2019-06-20 15:11:49 -04:00
4c8b8d0c16
Only check pts vs dts if pts isn't AV_NOPTS_VALUE. Also set frame_size in output codec when doing passthrough
2019-06-20 15:09:30 -04:00
8b95ba8b3c
it is ok for pts to be AV_NOPT_VALUE. It is not yet deprecated and doesn't mess anything up.
2019-06-20 15:08:38 -04:00
db7362dbcb
Merge branch 'master' into storageareas
2019-06-20 14:18:47 -04:00
3bae7a5432
spaces and parenthesis
2019-06-20 13:28:12 -04:00
b068428bbc
zmcontrol complains about unfinished statement handles. This is because we aren't finishing them in functions in Database.pm
2019-06-20 13:27:42 -04:00
540a114c4b
spacing google code style
2019-06-19 10:31:53 -04:00
cc35e3f187
add dumpQueue to packetqueue to print out the contents
2019-06-19 09:51:06 -04:00
16b035f76c
Use common first_dts/pts instead of separate video and audio first pts/dts
2019-06-19 09:22:21 -04:00
9727d0ed9f
spaces
2019-06-19 09:22:21 -04:00
847cd9f347
Print out an error when a monitor is in MONITOR mode because we can't handle alarms. Allow signals to terminate zmu by checking zm_terminate.
2019-06-19 09:22:21 -04:00
77eb15ff17
fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns
2019-06-19 09:22:21 -04:00
70a91c7069
WIP: Add pagination to frames.php in classic ( #2618 )
...
* add pagination to the frames.php results
* remove commented code, fix view all paging
* removing debugging logging statements
* default frames paging to on
2019-06-19 09:22:21 -04:00
a6e42e4317
remove a password log, corrected PHP version in log ( #2627 )
...
* remove a password log, corrected PHP version in log
* PHP version correction
2019-06-19 09:22:21 -04:00
2d5f84cd22
add event file system path to API ( #2639 )
2019-06-19 09:22:21 -04:00
199e8182be
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-19 08:36:48 -04:00
33951ae584
Print out an error when a monitor is in MONITOR mode because we can't handle alarms. Allow signals to terminate zmu by checking zm_terminate.
2019-06-19 08:36:37 -04:00
dc7707bbc1
fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns
2019-06-18 10:03:14 -04:00
1336c03f97
WIP: Add pagination to frames.php in classic ( #2618 )
...
* add pagination to the frames.php results
* remove commented code, fix view all paging
* removing debugging logging statements
* default frames paging to on
2019-06-16 12:02:00 -04:00
98bf7800b0
remove a password log, corrected PHP version in log ( #2627 )
...
* remove a password log, corrected PHP version in log
* PHP version correction
2019-06-16 11:59:48 -04:00
Isaac Connor
Tom Hodder
Isaac Connor
Pliable Pixels
Andrew Bauer