techrockedge
|
51d3e6b2cd
|
changed to ZM db functions
|
2019-01-02 14:09:35 -05:00 |
Isaac Connor
|
874930d8fc
|
Merge branch 'master' into improve_config_efficiency
|
2019-01-02 13:07:53 -05:00 |
Isaac Connor
|
99471836b7
|
Use monitor's serverId when loading server object so that images load from recording server.
|
2019-01-02 11:28:12 -05:00 |
|
Isaac Connor
|
8a1707a615
|
Add monitorServerId array to provide server info for each monitor so that we can load images from the recording server.
|
2019-01-02 11:27:46 -05:00 |
|
Isaac Connor
|
79113a6869
|
Add a default Server object to handle non-multi-server case
|
2019-01-02 10:56:40 -05:00 |
Andrew Bauer
|
bd2b761bcd
|
change configdata.pm.in defaults
|
2018-12-31 09:54:48 -06:00 |
|
techrockedge
|
f25e176b88
|
added create table if not exist
|
2018-12-29 20:57:46 -05:00 |
|
techrockedge
|
60d5880694
|
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
|
2018-12-29 19:36:20 -05:00 |
|
techrockedge
|
2cac25d353
|
removed unused preset code
|
2018-12-29 19:35:16 -05:00 |
|
Isaac Connor
|
751c312609
|
fix non-ascii char
|
2018-12-29 09:56:33 -05:00 |
|
Andrew Bauer
|
d14e9ecf74
|
force overloadframes and ExtendAlarmFrames to int (#2373)
|
2018-12-29 09:53:31 -05:00 |
|
Andrew Bauer
|
3258d8e590
|
remove ZM_DIR_IMAGES (#2374)
|
2018-12-29 09:52:58 -05:00 |
|
techrockedge
|
bcbe9075f9
|
fixed preset delete and set
|
2018-12-28 21:11:52 -05:00 |
|
techrockedge
|
826201a3f9
|
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
|
2018-12-28 20:32:04 -05:00 |
|
Andrew Bauer
|
03e0be558f
|
Merge pull request #2372 from connortechnology/fix_2352
Update area when editing x and y coords
|
2018-12-28 12:55:45 -06:00 |
Andrew Bauer
|
35f89962e2
|
mention exclude alarm frame feature in preclusive
|
2018-12-28 12:40:17 -06:00 |
|
Andrew Bauer
|
0d1539802c
|
attempt to trigger readthedocs
|
2018-12-28 12:34:37 -06:00 |
|
Andrew Bauer
|
77f51e6d6a
|
attempt to trigger readthedocs
|
2018-12-28 12:34:09 -06:00 |
|
Andrew Bauer
|
b8335b3e2a
|
Update definezone.rst
|
2018-12-28 09:49:05 -06:00 |
|
Andrew Bauer
|
893048c306
|
remove option to build with no ffmpeg (#2365)
|
2018-12-28 10:46:27 -05:00 |
|
Andrew Bauer
|
a029909972
|
fix path to thumb and anal images (#2367)
|
2018-12-28 10:46:13 -05:00 |
|
Andrew Bauer
|
fb37fc48e1
|
update viewImagePatch (#2370)
|
2018-12-28 10:38:39 -05:00 |
|
Andrew Bauer
|
2fbc1481f8
|
Merge pull request #2371 from jimender2/2369-Misspelling-fix
2369 misspelling fix
|
2018-12-28 07:06:22 -06:00 |
Jonathan Meredith
|
265a73ab29
|
Spelling mistake fix
Changed his to this
|
2018-12-27 22:26:07 -05:00 |
|
Jonathan Meredith
|
6e7ecf4e89
|
Fix spelling mistake
Changed his to this
|
2018-12-27 22:20:24 -05:00 |
|
Andrew Bauer
|
c128998c20
|
Update redhat.rst
|
2018-12-27 18:16:52 -06:00 |
|
Isaac Connor
|
101f24feb5
|
Update area when editing x and y coords (#2366)
|
2018-12-27 14:28:14 -05:00 |
|
Isaac Connor
|
4937a68650
|
Update area when editing x and y coords
|
2018-12-27 14:27:43 -05:00 |
|
Isaac Connor
|
32c88a3a41
|
Update status as well as fps when updating fps
|
2018-12-27 13:50:17 -05:00 |
|
Isaac Connor
|
08e5166bcb
|
remove quotes around state in command documentation.
|
2018-12-27 12:24:50 -05:00 |
|
Isaac Connor
|
c017219a1e
|
use do instead of many lines of dbi. Cleanup logic around command detection
|
2018-12-27 12:22:06 -05:00 |
|
Isaac Connor
|
55639a5c45
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-12-27 11:53:31 -05:00 |
|
Isaac Connor
|
db6d943854
|
If failure in connect, close the fd before returning
|
2018-12-27 11:53:21 -05:00 |
|
Isaac Connor
|
b87ae53a83
|
merge debug lines and correct spacing
|
2018-12-27 11:50:43 -05:00 |
|
Andrew Bauer
|
5f9a113da1
|
redirect to montage rather than montagereview
|
2018-12-26 10:34:01 -06:00 |
|
techrockedge
|
731453a7cd
|
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
continued work
|
2018-12-26 10:55:20 -05:00 |
|
Andrew Bauer
|
27dd8166ea
|
Merge pull request #2362 from connortechnology/small_groups_fixes
Small groups fixes
|
2018-12-24 11:30:57 -06:00 |
|
Isaac Connor
|
55e0d82f20
|
spacing
|
2018-12-24 11:30:22 -05:00 |
|
Isaac Connor
|
e0a9c4a21e
|
fix event popup detection
|
2018-12-24 11:23:58 -05:00 |
|
Isaac Connor
|
68adc289fe
|
Fix colspan count now that depth is zero-based
|
2018-12-24 09:40:23 -05:00 |
|
Isaac Connor
|
e0cae5709f
|
Group::find is now more powerful so we can just use it to return all Groups to be deleted
|
2018-12-24 09:39:40 -05:00 |
|
Isaac Connor
|
63199289ad
|
Change depth function to be 0-based.
|
2018-12-24 09:38:55 -05:00 |
|
Isaac Connor
|
0cce0a642b
|
Update chosen library to 1.8.7
|
2018-12-24 09:37:49 -05:00 |
|
techrockedge
|
f815aaa5f5
|
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
|
2018-12-21 19:46:45 -05:00 |
|
Andrew Bauer
|
153877b9c0
|
Merge pull request #2359 from connortechnology/fix_2353
Update permissions checking for Groups to not use session. Fixes #2353
|
2018-12-21 15:16:49 -06:00 |
|
Isaac Connor
|
e5a073c8df
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-12-21 10:50:30 -05:00 |
|
Isaac Connor
|
1130d6650a
|
Fix spacing and pass popup to previous/next event so that popups stay as popups
|
2018-12-21 10:50:19 -05:00 |
|
Isaac Connor
|
47465260d1
|
Update permissions checking for Groups to not use session. Fixes #2353
|
2018-12-21 10:01:48 -05:00 |
|
Andrew Bauer
|
6eb7892fc7
|
Merge pull request #2357 from connortechnology/libswresample
Implement libswresample support as an alternative to libavresample, w…
|
2018-12-20 16:44:06 -06:00 |
|
Isaac Connor
|
48865f124b
|
cap AAC bitrate at 96000 to prevent the aac encoder from complaining
|
2018-12-20 15:10:04 -05:00 |