9284e26512
get rid of the snapshot setting. If we aren't storing all frames, then we should always store the snapshot.
2018-01-13 15:15:14 -05:00
2922a86d23
fixes to new Storage Schemes code
2017-12-19 11:01:03 -05:00
8a8001f14a
fix missingc_str()
2017-12-18 13:25:24 -05:00
705a98276f
change StorageScheme to Scheme
2017-12-18 13:17:43 -05:00
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
2df96bf6ee
use the return value of stat
2017-12-12 12:51:54 -05:00
0eb2ae60f3
only try to write timecodes if the open was successful
2017-11-22 12:13:28 -08:00
3c55daaf36
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
2017-11-22 12:10:54 -08:00
a1fe0c4de3
store the value of saveJpegs in the event
2017-11-21 23:56:22 -05:00
159c0a7165
moer cppcheck fixes
2017-11-17 07:52:26 -05:00
2d3aa08303
include <0 in test on event frame timestamp
2017-10-23 09:56:30 -04:00
666233af54
fix mving capture_file_format to staticCOnfig
2017-10-18 20:46:26 -04:00
ad97023732
spacing
2017-10-12 08:54:43 -07:00
8ea335d45e
whitespace
2017-10-10 15:08:24 -04:00
7b2163f824
add debug
2017-10-10 12:58:06 -04:00
219b7e0f36
output failing sql
2017-10-08 09:13:56 -04:00
869d2b4f16
make failure to symlink non-fatal. Someday we may want to use a file store that doesn't do symlinks
2017-09-25 16:22:41 -04:00
c241b6dddd
Merge branch 'split_zmeventstream' into storageareas
2017-06-22 10:46:32 -04:00
226514e887
split EventStream into it's own files
2017-06-22 10:10:28 -04:00
76f63686cb
Merge branch 'fix_event_viewing' into storageareas
2017-06-22 09:24:31 -04:00
5e75588bfb
Fix event viewing. Output a frame immediately on zoom in/out. Fix recursive loop on play/pause
2017-06-21 17:14:02 -04:00
f0d80ddfd4
fix runstate merge
2017-06-13 21:18:09 -04:00
7a67a5e475
fix merge
2017-06-13 21:15:58 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
bf04a68085
Merge pull request #1752 from connortechnology/filter_by_runstate
...
rough in the ability to filter on RunState
2017-06-12 20:54:17 -05:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
01717a5c14
Merge branch 'master' into filter_by_runstate
2017-06-06 20:34:47 -04:00
9534c725d6
Merge branch 'master' into storageareas
2017-06-05 09:21:37 -04:00
187bec40ec
Fix #1906
2017-06-05 09:05:17 -04:00
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
03495e8c23
fix
2017-05-20 09:54:03 -04:00
1ab8530aed
use enum values to make code more readable. Better error message on event insertion failure
2017-05-20 08:34:46 -04:00
7ecbcd8f12
code documentation
2017-05-20 08:26:55 -04:00
7caeee6bf8
Merge branch 'master' into storageareas
2017-05-19 15:09:44 -04:00
e7ca892efd
merge more differences from SA
2017-05-19 15:07:41 -04:00
91138ba8a1
Merge branch 'master' into storageareas
2017-05-19 14:53:08 -04:00
44e5b6f829
remove redundant code
2017-05-19 14:52:45 -04:00
9e54efdfcf
Merge branch 'master' into storageareas
2017-05-19 14:49:25 -04:00
7c889add76
cleanup sql to load event data. Don't need MonitorName
2017-05-19 14:43:49 -04:00
764c76f98a
add loading the video filename when loading event data
2017-05-19 14:29:08 -04:00
e79d2c5a00
Merge branch 'master' into storageareas
2017-05-19 14:26:28 -04:00
7dccbac78d
clenaup
2017-05-19 14:25:44 -04:00
ccc9f6fdf6
remove redundant code
2017-05-19 14:24:49 -04:00
1e4792e13d
Merge branch 'master' into storageareas
2017-05-19 13:36:23 -04:00
aab08db84b
Merge branch 'master' into storageareas
2017-05-19 13:35:31 -04:00
c4e68f8cfd
fix some spacing problems caused by missing ;
2017-05-19 13:35:13 -04:00
5e2220efa0
add a missing ; at end of line, and remove end of line spaces
2017-05-19 13:30:08 -04:00
3fcca1021d
add missing; and fix spacing
2017-05-19 13:28:34 -04:00
bbb77ab7dd
reorder lines to make diff from master cleaner
2017-05-19 13:27:18 -04:00
cb3ee3484a
remove work in progress crap from zm_event
2017-05-18 09:08:31 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Andrew Bauer