Isaac Connor
|
a610d564d1
|
tweak timeouts
|
2018-01-31 15:51:12 -05:00 |
|
Isaac Connor
|
b390633f70
|
Fix authHash generation
|
2018-01-31 14:58:01 -05:00 |
|
Isaac Connor
|
ef51a21df4
|
add new runstate called Connected
|
2018-01-31 14:36:41 -05:00 |
|
Isaac Connor
|
6942aaed15
|
whitespace
|
2018-01-31 14:36:01 -05:00 |
|
Isaac Connor
|
132fff1931
|
An ok json return with no status is possible now
|
2018-01-31 14:35:48 -05:00 |
|
Isaac Connor
|
018523134e
|
use ZM_BASE_PROTOCOL when loading plugins. https can't load http content
|
2018-01-31 14:35:23 -05:00 |
|
Isaac Connor
|
882a242b76
|
Fix mpeg streaming.
|
2018-01-31 14:35:00 -05:00 |
|
Isaac Connor
|
31ad807a90
|
If ffmpeg is open in PrimeCapture, close it. Turn all Fatals into Errors
|
2018-01-31 14:34:39 -05:00 |
|
Isaac Connor
|
bdb5176981
|
increase debug lvel of dumpPacket
|
2018-01-31 14:33:42 -05:00 |
|
Isaac Connor
|
c9bc5a8cd8
|
if given timestamp is in the future, reset it, it is likely invalid
|
2018-01-31 14:33:20 -05:00 |
|
Isaac Connor
|
ba2c111762
|
restructure to keep trying to open the camera instead of exiting.
|
2018-01-31 14:32:48 -05:00 |
|
Isaac Connor
|
7c3efc02cd
|
put back old add monitor popup
|
2018-01-31 11:56:57 -05:00 |
|
Isaac Connor
|
218e34a079
|
Can only have 6 digitals, not 8
|
2018-01-30 11:23:09 -05:00 |
|
Isaac Connor
|
4933b37b69
|
fix log levels
|
2018-01-30 10:45:32 -05:00 |
|
Isaac Connor
|
b1f2b677c3
|
remove path from source
|
2018-01-30 10:09:12 -05:00 |
|
Isaac Connor
|
aea1816e8e
|
Add in signal handlers to as to complete an action before exiting.
|
2018-01-30 09:19:08 -05:00 |
|
Isaac Connor
|
8c90a8a47a
|
Fix Id => MonitorId in MonitorStatus
|
2018-01-29 23:06:59 -05:00 |
|
Isaac Connor
|
7ec71868a6
|
Switch CakePHP-Enum-Behavior to my fixed version
|
2018-01-29 21:25:40 -05:00 |
|
Isaac Connor
|
9f5c8078fc
|
handle when reading the link returns nothing
|
2018-01-29 21:16:41 -05:00 |
|
Isaac Connor
|
b9a98d34bf
|
strip query and scheme from source
|
2018-01-29 19:03:16 -05:00 |
|
Isaac Connor
|
a60da6811b
|
revert adding custom port for status updates. It breaks in the non-multiserver case.
|
2018-01-29 15:17:22 -05:00 |
Isaac Connor
|
6acb555c52
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-29 10:42:23 -08:00 |
|
Isaac Connor
|
d19b8bc5cf
|
add default value for ServerId in new Storage Object
|
2018-01-29 10:41:59 -08:00 |
|
Isaac Connor
|
06673019f9
|
add default values for zmstats, zmaudit, zmtrigger in new Server
|
2018-01-29 10:41:43 -08:00 |
|
Isaac Connor
|
31b7deb101
|
Return NULL on error in dbQuery
|
2018-01-29 10:41:24 -08:00 |
|
Isaac Connor
|
c9e32fb344
|
Check for successful Monitor db Insertion
|
2018-01-29 10:41:09 -08:00 |
|
Isaac Connor
|
e638817cb9
|
Check for ServerId exists in MonitorObject
|
2018-01-29 10:40:50 -08:00 |
|
Isaac Connor
|
1d221dff7c
|
Frame throttling is not an error.
|
2018-01-29 11:45:33 -05:00 |
|
Isaac Connor
|
7074681e60
|
Need drop permissions
|
2018-01-29 11:44:29 -05:00 |
|
Isaac Connor
|
525749c11a
|
Need drop permissions
|
2018-01-29 11:44:03 -05:00 |
|
Isaac Connor
|
8979f14314
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-29 11:29:33 -05:00 |
|
Isaac Connor
|
a76fcb331c
|
Remove debugging. Treat can't get semaphore as a non-error
|
2018-01-29 08:25:46 -08:00 |
|
Isaac Connor
|
73d84c6b08
|
fix typo
|
2018-01-29 07:53:48 -08:00 |
|
Isaac Connor
|
4751920423
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-29 07:49:38 -08:00 |
|
Isaac Connor
|
35cda5cf17
|
Merge sjc04p1fviap02:ZoneMinder into storageareas
|
2018-01-29 07:45:55 -08:00 |
|
Isaac Connor
|
a490c0e5bf
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-29 07:45:37 -08:00 |
|
Isaac Connor
|
a782ef1db7
|
Add debug tests for loading all events
|
2018-01-29 07:45:28 -08:00 |
|
Isaac Connor
|
e672841a8d
|
Add remote server port to monitor url
|
2018-01-29 07:42:43 -08:00 |
|
Isaac Connor
|
bfbd033971
|
Fix getting stream status updates when # of files open is > 1024.
|
2018-01-29 07:41:29 -08:00 |
|
Isaac Connor
|
c89d4e424e
|
Add error check for no Storage Areas found for this server
|
2018-01-29 07:40:37 -08:00 |
|
Isaac Connor
|
7eaa0180e5
|
Better debugging
|
2018-01-29 07:38:24 -08:00 |
|
Isaac Connor
|
03122b9015
|
add onFailure logger, and change link to chain so that responses don't just disappear
|
2018-01-29 07:38:02 -08:00 |
|
Isaac Connor
|
fc4edefd81
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-29 07:35:24 -08:00 |
|
Isaac Connor
|
dc6842bfbd
|
Add remote server port to monitor url
|
2018-01-29 07:32:40 -08:00 |
|
Isaac Connor
|
b793e6659b
|
add onFailure logger, and change link to chain so that responses don't just disappear
|
2018-01-29 07:32:02 -08:00 |
|
Isaac Connor
|
984d3a2dd1
|
add Monitor Name to the response listing the available camera feeds
|
2018-01-29 07:30:46 -08:00 |
|
Isaac Connor
|
0b2d752ea4
|
Use chosen on the MonitorIds select.
|
2018-01-29 10:29:59 -05:00 |
|
Isaac Connor
|
8c4a786114
|
Move status fields out of the object fields
|
2018-01-29 10:27:46 -05:00 |
|
Isaac Connor
|
7e2f132cdd
|
Better debugging
|
2018-01-29 07:22:05 -08:00 |
|
Isaac Connor
|
b1b8b42f2b
|
Fix getting stream status updates when # of files open is > 1024.
|
2018-01-29 07:21:31 -08:00 |