a73e367d5e
add libav-tools as an option instead of ffmpeg
2014-06-04 11:21:43 -04:00
5fea101294
Merge pull request #421 from m-bene/ffmpegoptions
...
Add optional options field for ffmpeg and VLC source types
2014-05-18 18:07:42 +03:00
82447ebb27
remove unwanted comment change
2014-05-17 22:05:57 +02:00
a81b9b8ce2
change examples for options
2014-05-17 21:48:08 +02:00
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
de107f77ba
fix option help text for overlooked languages
2014-05-17 04:51:01 +02:00
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
1b4f9c082c
change check for av_dict_set success
2014-05-15 16:01:29 +02:00
6016206f98
modify debug message
2014-05-15 15:42:27 +02:00
5cb7cd916f
add quotes to option debug/warn messages
2014-05-15 15:13:39 +02:00
c1557a99e5
add debug and warn messages
2014-05-15 15:06:01 +02:00
bad679e026
Merge pull request #426 from m-bene/extendPreclusive
...
Add new colum ExtendAlarmFrames to db/zm_create.sql.in
2014-05-08 05:41:58 +03:00
79a13cf750
adjust inserts to ZonePresets
2014-05-08 03:49:48 +02:00
aae6dbed13
Add new colums to zm_create.sql.in
2014-05-08 02:53:44 +02:00
a6a9d9f270
add Options field to zm_create.sql.in
2014-05-08 02:30:54 +02:00
00aad4a128
frame_count should be an integer so don't use NULL
2014-05-05 13:06:58 -04:00
2b168e6379
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-05-05 11:30:52 -04:00
8333e909ed
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-05-05 11:29:55 -04:00
a8929914bb
add a NULL test for frame_coutn before calling atoi.
2014-05-05 11:29:09 -04:00
6f87d3fc5f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-05-05 11:17:00 -04:00
ae0ee9b3b3
testing/fixing
2014-05-05 15:54:13 +02:00
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
4de46c7988
Fix wrong values used for type boolean
2014-05-05 09:26:32 +03:00
f32b099f5e
Merge pull request #418 from aztazt/patch-1
...
Update zm_jpeg.cpp to use correct values for libjpeg's boolean type
2014-05-05 09:17:57 +03:00
e916ce22d9
Update zm_jpeg.cpp
...
Change 0 to FALSE in order to avoid compiling error on Debian Wheezy:
[ 31%] Building CXX object src/CMakeFiles/zm.dir/zm_image.cpp.o
/opt/ZoneMinder/src/zm_image.cpp: In member function ‘bool Image::WriteJpeg(const char*, int) const’:
/opt/ZoneMinder/src/zm_image.cpp:863:42: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘3’ to ‘void jpeg_set_quality(j_compress_ptr, int, boolean)’
/opt/ZoneMinder/src/zm_image.cpp: In member function ‘bool Image::EncodeJpeg(JOCTET*, int*, int) const’:
/opt/ZoneMinder/src/zm_image.cpp:1096:42: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘3’ to ‘void jpeg_set_quality(j_compress_ptr, int, boolean)’
make[2]: *** [src/CMakeFiles/zm.dir/zm_image.cpp.o] Error 1
make[1]: *** [src/CMakeFiles/zm.dir/all] Error 2
make: *** [all] Error 2
2014-05-04 02:35:17 +02:00
cec66de647
Merge pull request #416 from kylejohnson/master
...
Added an FAQ for AlarmCheckMethod
2014-05-02 08:37:52 -04:00
312f378d08
Formatting and spell check on the FAQ
2014-05-02 08:31:26 -04:00
435eac5e7e
Expanded upon the AlarmCheckMethod FAQ
2014-05-02 08:28:38 -04:00
5fb17ecfb6
Change one of the FAQs from h1 to h2
2014-05-02 08:16:27 -04:00
26ba50f8ac
Added an FAQ for AlarmCheckMethod
2014-05-02 08:14:57 -04:00
b197f985e0
make expiry date relative (~10years)
2014-05-01 09:53:45 +02:00
ed7ca66045
make skin selection cookie persistent
2014-05-01 09:37:39 +02:00
6d58f6591b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-04-30 10:10:49 -04:00
1d9d84cc49
max executable
2014-04-30 10:10:34 -04:00
8da9383d5d
use PDO style
2014-04-30 10:09:27 -04:00
e94fca2778
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-04-30 10:01:29 -04:00
b3226223f8
remove uses of dbEscape
2014-04-30 10:01:10 -04:00
20e4570216
Merge pull request #413 from kylejohnson/master
...
Added a doc for contributing to the project
2014-04-30 09:52:16 -04:00
cb2a9af647
Added a doc for contributing to the project
2014-04-30 13:48:03 +00:00
931385fdee
Merge pull request #409 from ZoneMinder/api_cmake
...
Add the web/api folder to cmake
2014-04-30 09:19:02 -04:00
016b5e3677
Merge pull request #411 from martin67/patch-1
...
Don't open /dev/ttyS0 by default in zmtrigger.pl.in
2014-04-30 09:17:03 -04:00
a148e04ea2
Update zmtrigger.pl.in
...
zmtrigger.pl should not open serial port #1 by default. There could be situations where other hardware etc. would be attached to the port that is not used by zoneminder.
Better if this can be commented out by default and if a user needs serial access, he can enable it by removing the comment.
This line also gives an permissions error when running on Ubuntu which prevents zmtrigger to start. That error can probably be fixed by adding the zm user permission to the serial port. But the main issue is that if the program does not need access to the port, it should not open it.
2014-04-30 15:07:29 +02:00
ec5784abe2
Fix wrong install path for core.php and database.php
2014-04-30 12:25:42 +03:00
afd4e451fd
Add the web/api folder to cmake
2014-04-30 12:16:46 +03:00
0e2a164c08
Merge pull request #408 from kylejohnson/master
...
Move API to under web dir
2014-04-29 23:31:37 -04:00
ab884aa41b
Added a README to the docs dir
2014-04-30 03:30:31 +00:00
dd854828f0
Change one of the FAQs from h1 to h2
2014-04-30 03:29:11 +00:00
ef19d8cf18
Added another issue to the FAQ (can't see Zones)
2014-04-30 03:24:48 +00:00
4d2f270041
Added FAQ to docs
2014-04-30 03:11:20 +00:00
40e929e7a6
Changed the API readme to be ZoneMinder-relevant
2014-04-29 20:49:54 +00:00
Isaac Connor
Kfir Itzhak
m-bene
aztazt
Kyle Johnson
Kyle Johnson
Martin Hagelin