Isaac Connor
|
dee843d7da
|
add All and remove default from Storage dropdown options
|
2018-02-02 12:48:49 -05:00 |
|
Isaac Connor
|
060e6893cc
|
fix Storage dropdown population and don't clear value on line type change
|
2018-02-02 12:48:22 -05:00 |
|
Isaac Connor
|
e8ace6d4dd
|
include base version of jquery-ui-theme
|
2018-02-02 12:47:51 -05:00 |
|
Isaac Connor
|
b0f755b5fc
|
put unarchive, archive, delete in a transaction for speed
|
2018-02-02 12:14:01 -05:00 |
|
Isaac Connor
|
f702b37445
|
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
|
2018-02-02 12:09:03 -05:00 |
|
Isaac Connor
|
8e8b6bdc36
|
Select Events by StorageArea
|
2018-02-02 12:08:54 -05:00 |
Isaac Connor
|
0287868f5e
|
include the status when error runCommand
|
2018-02-02 11:06:47 -05:00 |
|
Isaac Connor
|
87ef17dddc
|
errors running a command should NOT exit!
|
2018-02-02 11:05:56 -05:00 |
|
Isaac Connor
|
868e17a414
|
Allow Method in Monitors to be NULL
|
2018-02-02 10:31:55 -05:00 |
|
Isaac Connor
|
68521aa0d4
|
spacing, remove debug lines
|
2018-02-02 10:27:50 -05:00 |
|
Isaac Connor
|
929e49c301
|
early return if there is no rows returned. Improve debug when there is a row but the specified column isn't present
|
2018-02-02 10:27:30 -05:00 |
|
Isaac Connor
|
40379f7df6
|
bump version
|
2018-02-01 11:33:56 -05:00 |
|
Isaac Connor
|
060acffb9d
|
make DiskSpace in storage table be int instead of unsigned. Event deletions can make it go negative and then the delete fails.
|
2018-02-01 11:32:55 -05:00 |
|
Isaac Connor
|
73edd3221a
|
make DiskSpace in storage table be int instead of unsigned. Event deletions can make it go negative and then the delete fails.
|
2018-02-01 11:32:44 -05:00 |
|
Isaac Connor
|
26ac1fd695
|
Include soap version in list of onvif cameras
|
2018-02-01 11:32:13 -05:00 |
|
Isaac Connor
|
212882efb9
|
db errors should NOT BE FATAL!
|
2018-02-01 11:31:25 -05:00 |
|
Isaac Connor
|
2861779249
|
move zmonvif-probe.pl from the onvif library code and update it to use ZoneMinder::ONVIF
|
2018-01-31 16:57:17 -05:00 |
|
Isaac Connor
|
c96f47886c
|
Fix discover not picking up a 1.2 response if we already have a 1.1
|
2018-01-31 16:56:46 -05:00 |
|
Isaac Connor
|
e7fb0f649b
|
move zmonvif-probe.pl to ../scripts. This is in preparation for removing the onvif library from the Zoneminder source into it's own package.
|
2018-01-31 16:56:14 -05:00 |
|
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
|
3ce46d3fed
|
Merge branch 'storageareas' into zma_to_thread
|
2018-01-29 15:55:05 -05:00 |
|
Isaac Connor
|
67b365948e
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
web/includes/Monitor.php
web/skins/classic/views/js/add_monitors.js
web/skins/classic/views/js/console.js
|
2018-01-29 15:53:26 -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
|
5b238f713d
|
fix comma
|
2018-01-29 11:52:17 -05:00 |
|
Isaac Connor
|
1d221dff7c
|
Frame throttling is not an error.
|
2018-01-29 11:45:33 -05:00 |