79b7792466
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
...
Conflicts:
scripts/zmdc.pl.in
2014-06-25 15:30:04 -04:00
c58c4a9720
add the glue to define HOST_OS and use it to detect BSD and use different arguments to killall
2014-06-25 15:28:10 -04:00
676c73e26e
Merge pull request #445 from clandmeter/busybox-compat
...
scripts: BusyBox compatibility
2014-06-25 15:24:51 -04:00
623837115b
fix missing ARRAY() around params to dbFetchOne
2014-06-25 14:01:45 -04:00
5fac727c2f
Users tab should always be available
2014-06-25 13:40:37 -04:00
11718f0559
The users tab should always be available. It is useful to configure users BEFORE turning on auth.
2014-06-25 13:39:31 -04:00
b2323cb36d
scripts: BusyBox compatibility
...
BusyBox killall does not support long options using short options instead
2014-06-25 11:19:15 +02:00
f2eddf0850
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-06-24 11:22:34 -04:00
0592276f53
fix mysql_escape_string calls after referring to docs
2014-06-24 11:22:08 -04:00
924e65f42c
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-06-20 12:43:07 -04:00
0f4e9eb3e4
add these dependencies, apparently they are required for sftp upload
2014-06-17 10:54:42 -04:00
03abd3c936
Merge pull request #442 from Tim-Craig/master
...
Fixed issue DateTime handling in filter queries that broke timeline view...
2014-06-17 10:37:56 -04:00
8ac6ce17bc
Fixed issue DateTime handling in filter queries that broke timeline view.
2014-06-15 13:05:25 -07:00
b48d06b279
change commands to handle if db already has the User and Pass fields
2014-06-13 16:09:01 -04:00
047cff8038
Added contribution and development tips to README
2014-06-10 15:43:25 -04:00
a9cd6caeaf
Minor corrections to cURL code
2014-06-06 09:35:02 +03:00
caa0cb0fd5
Bump version to v1.27.1 to fix upgrade db issues
2014-06-06 08:58:35 +03:00
5bf894d263
guard against unsafe monitor name
2014-06-05 15:23:15 -04:00
0689e8453c
guard against dangerous (old or new) monitor names
...
by rogerroger288
2014-06-05 15:21:28 -04:00
baf5da9561
guard against monitor names being dangerous
...
by rogerroger288
2014-06-05 15:20:04 -04:00
93aed26a00
escape username and password inside zm_user
...
by rogerroger288
2014-06-05 15:18:02 -04:00
5ae3cb8907
merge some security fixes from rogerroger288
2014-06-05 15:14:12 -04:00
fa2371f8e6
Merge pull request #438 from bountysource-support/patch-1
...
Add Bountysource badge to README
2014-06-05 10:58:19 -04:00
007eadeb19
Add Bountysource badge to README
...
Because you have some open bounties, we thought you might want to display this badge in your README!
2014-06-04 14:42:42 -07:00
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
Isaac Connor
Isaac Connor
Carlo Landmeter
tim
Kyle Johnson
Kfir Itzhak
bountysource-support
m-bene
aztazt