Andrew Bauer
|
8b37c0e9b0
|
remove bcrypt & jwt-cpp as submodules, bring in statically under src
|
2019-06-23 12:12:12 -05:00 |
Isaac Connor
|
46032385fe
|
fix viewport on mobile. Fix duplicated css when selected css is base
|
2019-06-22 14:10:55 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
85b9b045cc
|
Copy Profile Token to ControlDevice for use with Netcat PTZ script
|
2019-06-21 12:42:26 -04:00 |
|
Isaac Connor
|
60618d5998
|
Fix hour subtraction in getAuthUser to actually subtract an hour
|
2019-06-21 11:45:33 -04:00 |
|
Isaac Connor
|
ad1df8f80a
|
log the response if command fails, and add missing uthentication sections
|
2019-06-21 11:40:46 -04:00 |
|
Isaac Connor
|
5a0b30efd5
|
escape $
|
2019-06-21 10:19:48 -04:00 |
|
Isaac Connor
|
55d98e4a9f
|
fix crash
|
2019-06-20 15:56:25 -04:00 |
|
Isaac Connor
|
470da03322
|
Merge sync fixes from storageareas
|
2019-06-20 15:14:20 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
db7362dbcb
|
Merge branch 'master' into storageareas
|
2019-06-20 14:18:47 -04:00 |
|
Isaac Connor
|
d026c61077
|
Don't allow saving to built in layouts
|
2019-06-20 13:48:14 -04:00 |
|
Isaac Connor
|
71eadfc40e
|
Merge branch 'remove-extra-px' of https://github.com/tolland/zoneminder into tolland-remove-extra-px
|
2019-06-20 13:28:24 -04:00 |
|
Isaac Connor
|
3bae7a5432
|
spaces and parenthesis
|
2019-06-20 13:28:12 -04:00 |
|
Isaac Connor
|
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 |
tolland
|
ffaad88bf0
|
switch to using SVG scaling to deal with zone polygons
|
2019-06-20 17:11:22 +00:00 |
|
tolland
|
edd52e7fbf
|
add js method to track liveStream img size for zones
|
2019-06-20 12:46:04 +00:00 |
|
tolland
|
4da5c52cd2
|
remove extra px in svg tag
|
2019-06-19 20:18:38 +00:00 |
|
Isaac Connor
|
540a114c4b
|
spacing google code style
|
2019-06-19 10:31:53 -04:00 |
|
Isaac Connor
|
cc35e3f187
|
add dumpQueue to packetqueue to print out the contents
|
2019-06-19 09:51:06 -04:00 |
|
Isaac Connor
|
16b035f76c
|
Use common first_dts/pts instead of separate video and audio first pts/dts
|
2019-06-19 09:22:21 -04:00 |
|
Isaac Connor
|
9727d0ed9f
|
spaces
|
2019-06-19 09:22:21 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
77eb15ff17
|
fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns
|
2019-06-19 09:22:21 -04:00 |
|
Tom Hodder
|
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 |
Pliable Pixels
|
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 |
|
Pliable Pixels
|
2d5f84cd22
|
add event file system path to API (#2639)
|
2019-06-19 09:22:21 -04:00 |
|
Isaac Connor
|
199e8182be
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-06-19 08:36:48 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
dc7707bbc1
|
fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns
|
2019-06-18 10:03:14 -04:00 |
|
Tom Hodder
|
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 |
|
Pliable Pixels
|
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 |
|
Pliable Pixels
|
c4dc5f34e4
|
add event file system path to API (#2639)
|
2019-06-16 11:59:23 -04:00 |
|
Isaac Connor
|
695bdfc1c6
|
big ::Analyze logic cleanup. Also implement close continuous event before starting motion event in MOCORD
|
2019-06-13 15:48:41 -04:00 |
|
Isaac Connor
|
b073505146
|
If either pts or dts is AV_NOPTS_VALUE then set equal to the other
|
2019-06-13 15:47:58 -04:00 |
|
Isaac Connor
|
9a33e55efc
|
Bump log level to warning if we are restarting any daemons. Daemons should NOT need to be restarted in a healthy system.
|
2019-06-13 11:53:26 -04:00 |
|
Isaac Connor
|
84648ac557
|
Merge branch 'master' into storageareas
|
2019-06-12 10:05:40 -04:00 |
|
Isaac Connor
|
30a210f68f
|
also need to adjust dts of last packet when switching events
|
2019-06-12 10:05:08 -04:00 |
|
Isaac Connor
|
d87f5e3276
|
Merge branch 'master' into storageareas
|
2019-06-11 14:39:08 -04:00 |
|
Isaac Connor
|
ec7b373913
|
fix structure of events_by_monitor_id
|
2019-06-11 14:38:51 -04:00 |
|
Isaac Connor
|
1e7cf8c7cf
|
fix eslint, Fix video not resuming after setting speed to 0.
|
2019-06-11 14:38:28 -04:00 |
Isaac Connor
|
222f145230
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-06-11 13:56:13 -04:00 |
|
Isaac Connor
|
0a9ae1d4f9
|
Include pixdesc.h to get av_get_pix_fmt_name(AVPixelFormat)
|
2019-06-11 13:55:57 -04:00 |
|
Isaac Connor
|
1928d1153f
|
spacing and quotes
|
2019-06-11 13:32:15 -04:00 |
|
Isaac Connor
|
03419303b3
|
Merge remote-tracking branch 'origin/zoom_improve' into storageareas
|
2019-06-11 11:04:48 -04:00 |
|
Isaac Connor
|
1241761683
|
Add a title popup telling people about the zoomin/out/pan functions. Add ctrl-click to zoomout
|
2019-06-11 10:58:54 -04:00 |
|
Isaac Connor
|
acb95709e6
|
Fix issues with too much audio in events by storing packets in the queue with their timestamps converted to AV_TIME_BASE_Q, so that we can sort video and audio packets together.
|
2019-06-11 10:19:42 -04:00 |