Commit Graph

4375 Commits

Author SHA1 Message Date
abauer a2d9c0c042 Don't copy .in files into staging 2015-04-08 12:22:46 -05:00
Andrew Bauer e895fd26f7 cmake - use perl INSTALLDIRS 2015-04-07 08:19:21 -05:00
Andrew Bauer 8e5ba94ff8 Merge pull request #791 from onlyjob/783
#783 - related corrections
2015-04-06 07:05:40 -05:00
Dmitry Smirnov 904f2989ed Improving ZM_USE_DEEP_STORAGE description (#783):
Removed "If you are upgrading from a previous version of ZoneMinder" from
 description. From data loss prospective it is irrelevant whether database
 is upgraded or not as fresh install is just as vulnerable.
 Changed "enable" to "change" to emphasize the above.

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-06 18:39:13 +10:00
Dmitry Smirnov 078c5aa14b Briefly document "--migrate-events" option in zmupdate.pl (#783).
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-06 18:38:14 +10:00
Andrew Bauer 3e8c894a3e Update ConfigData.pm.in 2015-04-04 09:20:21 -05:00
Andrew Bauer d25f7ed362 Merge pull request #782 from onlyjob/export
skins/classic: fix HTML export with USE_DEEP_STORAGE (Closes: #506).
2015-04-04 08:37:06 -05:00
Dmitry Smirnov d1f00f02c2 skins/classic: fix HTML export with USE_DEEP_STORAGE (Closes: #506).
Use mygetEventPath() to get valid path.

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-04 20:39:06 +11:00
Isaac Connor 2671e71e33 Merge pull request #763 from onlyjob/podhelp
POD: zmupdate.pl converted to "pod2usage"
2015-03-30 13:29:03 -04:00
Dmitry Smirnov 5f6c559476 POD: zmupdate.pl converted to "pod2usage"
Best practice for POD documentation is to (re-)use it for displaying usage
 info. Now `perldoc zmupdate.pl` shows expected information and we can even
 generate man page automatically with `pod2man zmupdate.pl`.

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-31 02:47:16 +11:00
Isaac Connor 07d1846458 Merge pull request #761 from onlyjob/build
build: fix FTBFS with format-hardening (please review)
2015-03-30 08:48:53 -04:00
Andrew Bauer 01c8ef748f Merge pull request #759 from onlyjob/pod
fixing POD errors
2015-03-30 07:27:03 -05:00
Dmitry Smirnov 6bbe42c5eb build: fix FTBFS with format-hardening
~~~~
x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I..  -I/usr/include -I/usr/include -I/usr/include -D__STDC_CONSTANT_MACROS -Wall -finline-functions -fomit-frame-pointer -I/usr/include -D__STDC_CONSTANT_MACROS -D_FORTIFY_SOURCE=2 -D__STDC_CONSTANT_MACROS -D__STDC_CONSTANT_MACROS -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO -MT zm_mpeg.o -MD -MP -MF .deps/zm_mpeg.Tpo -c -o zm_mpeg.o zm_mpeg.cpp
zm_mpeg.cpp: In member function ‘void VideoStream::SetupFormat()’:
zm_mpeg.cpp:112:56: error: format not a string literal and no format arguments [-Werror=format-security]
snprintf( s->filename, sizeof(s->filename), filename );
                                                     ^
zm_mpeg.cpp:112:56: error: format not a string literal and no format arguments [-Werror=format-security]
~~~~

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 15:27:37 +11:00
Dmitry Smirnov b0faa138bd POD: added missing NAME sections
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 15:07:03 +11:00
Dmitry Smirnov 11f7af3b03 fixing POD errors
manpage-has-errors-from-pod2man (forgotten '=back' before '=head2')

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 14:41:01 +11:00
Isaac Connor 6aed8e5475 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-03-26 09:10:17 -04:00
Isaac Connor c816e79d65 Merge pull request #737 from knnniggett/netpbm
remove NETPBM dependency from autotools
2015-03-24 14:28:11 -04:00
Isaac Connor bc4d397534 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-03-23 13:13:26 -04:00
Isaac Connor cf40e20190 Merge pull request #746 from manupap1/fix_gitignore
Ignore autogenerated files in git
2015-03-17 08:33:28 -04:00
Emmanuel Papin a4985fb00d Ignore Makefile.old 2015-03-15 16:46:48 +01:00
Emmanuel Papin 0f10e2b24d Add config.h.in~ to the list of files to ignore 2015-03-14 23:23:21 +01:00
Emmanuel Papin 8a1d00dfd6 Ignore file added at compile time 2015-03-14 23:15:56 +01:00
Emmanuel Papin e219b5c86a Ignore files modified at compile time 2015-03-14 23:14:27 +01:00
Emmanuel Papin c68a325e8e Untrack files modified at compile time 2015-03-14 23:09:36 +01:00
Isaac Connor 2e10263b64 Improve logging to include monitor name and for shared cameras show 1/1 instead of 0/1 2015-03-04 16:34:31 -05:00
Isaac Connor 75cfc3f0cd bump release 2015-03-02 17:16:00 -05:00
Isaac Connor 098e66951e remove netpbm from debian packaging 2015-03-02 17:15:27 -05:00
Andrew Bauer 4cc6e6e5c6 Merge pull request #739 from ZoneMinder/fix_basic_rtsp_auth
when auth is needed, try command again before dying.
2015-03-02 10:20:51 -06:00
Isaac Connor 084e2a8b8f when auth is needed, try command again before dying. 2015-03-02 10:47:52 -05:00
Andrew Bauer 20107ac1e6 remove NETPBM dependency from autotools 2015-03-01 10:51:04 -06:00
Andrew Bauer b52ba9da3d Update version 2015-02-27 19:43:56 -06:00
Andrew Bauer 0346aab075 Merge pull request #732 from ZoneMinder/fix_rtsp_slash
fix extra slash when adding trackurl to controlurl
2015-02-26 09:53:57 -06:00
Isaac Connor 3c5b1fd07f fix extra slash when adding trackurl to controlurl 2015-02-26 10:22:21 -05:00
Isaac Connor 1a17c820f2 Merge pull request #730 from ljack/master
Fix image and css import paths for style/skin named "flat"
2015-02-25 11:51:42 -05:00
ljack e9384d445a fix .upBtn and .downBtn also for "flat" css 2015-02-25 18:10:40 +02:00
ljack 8616fdb33d fix import path 2015-02-25 18:09:23 +02:00
ljack 6233432559 fix import path 2015-02-25 18:08:41 +02:00
Isaac Connor 6b3bf4f7e6 Merge pull request #729 from ljack/patch-1
Update control.css
2015-02-25 07:27:22 -05:00
ljack 48950f3f1c Update control.css
Update paths for .upBtn and .downBtn too
2015-02-25 09:24:19 +02:00
Andrew Bauer 7971dc2e4c Merge pull request #728 from ZoneMinder/fix_event_view
Fix event view
2015-02-24 06:57:51 -06:00
Isaac Connor c4daecc997 Remove duplicated test for CANONICAL_HOST 2015-02-23 16:58:10 -05:00
Isaac Connor 362153cb3a Also fix video.pho which has the same problem. 2015-02-23 14:34:13 -05:00
Isaac Connor bff26154b0 Also fix video.pho which has the same problem. 2015-02-23 14:31:15 -05:00
Isaac Connor c9f109bc27 also fix timeline which has the same problem 2015-02-23 14:27:35 -05:00
Isaac Connor dd714665bd use explode instead of preg_split 2015-02-23 14:18:10 -05:00
Isaac Connor bd3a9806b8 Fix sql query when user is limited to specific monitors 2015-02-23 14:16:04 -05:00
Isaac Connor 99c7b212fa Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-02-23 14:15:15 -05:00
Isaac Connor 851a246cf2 Revert "Fix sql query when user is limited to specific monitors"
This reverts commit 41b581552e.
2015-02-23 14:10:53 -05:00
Isaac Connor 41b581552e Fix sql query when user is limited to specific monitors 2015-02-23 14:10:18 -05:00
Andrew Bauer 111e75e8e9 add psmisc pacakge requirement to rpm specfiles 2015-02-23 08:09:48 -06:00