Commit Graph

4699 Commits

Author SHA1 Message Date
Andrew Bauer fc64e3f01b Merge pull request #772 from balr0g/linked-cameras-trigger-on-new-events
Don't trigger linked cameras on new events
2015-04-15 20:23:54 -05:00
Isaac Connor 1668949f18 Merge pull request #792 from knnniggett/perl
cmake - use perl INSTALLDIRS
2015-04-15 11:07:14 -04:00
Andrew Bauer 91832e575d Merge pull request #809 from onlyjob/jquery
upgrade bundled jQuery (Closes: #785)
2015-04-15 07:30:27 -05:00
SteveGilvarry 14cf1bcae6 Clean up CMakeLists.txt, wrap lines, remove comments from initial commit, update comments. No functionality changes 2015-04-15 22:09:25 +10:00
Dmitry Smirnov b2f6bfb5fc upgrade bundled jQuery (Closes: #785)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-15 11:39:29 +10:00
Isaac Connor c17d156d95 Merge pull request #798 from onlyjob/PBP
zmcontrol.pl, zmfilter.pl: pod2usage + readability improvements.
2015-04-13 10:19:59 -04:00
Isaac Connor e1ef19f470 Merge pull request #802 from knnniggett/deep_storage
hide USE_DEEP_STORAGE
2015-04-13 10:17:03 -04:00
Andrew Bauer 38f6eb8b5f Update mootools to 1.5.1 2015-04-12 17:52:01 -05:00
Andrew Bauer 30765fdedf hide USE_DEEP_STORAGE 2015-04-12 12:20:20 -05:00
Andrew Bauer e4cf323949 Merge pull request #800 from Sune1337/pthread_join
* use pthread_join instead of pthread_tryjoin_np
2015-04-12 11:51:50 -05:00
Andrew Bauer 4cb8cf8681 remove commented commands 2015-04-12 11:48:49 -05:00
Andrew Bauer 3a3f186e74 update working_directory 2015-04-12 11:48:18 -05:00
Andrew Bauer 8f337999d4 remove nph-zms target 2015-04-12 11:47:28 -05:00
Andrew Bauer 3108fd2109 link nph-zms rather than build 2015-04-12 11:00:43 -05:00
Dmitry Smirnov afb127125d zmpkg.pl: correction for "Use of uninitialized value $command in string eq at zmpkg.pl line 62" 2015-04-11 22:41:07 +10:00
Dmitry Smirnov fa97348535 zmpkg.pl: pod2usage, tabs-to-spaces + readability 2015-04-11 22:39:32 +10:00
Dmitry Smirnov ac685fd247 zmfilter.pl: pod2usage + beautification 2015-04-11 11:18:21 +10:00
Dmitry Smirnov fba085a1c5 zmcontrol.pl: pod2usage (draft) + minor readability improvements.
Looks like "zmcontrol.pl" was based upon "zmfilter.pl" so it inherited
 commented description of the latter.
 Therefore "zmcontrol.pl" needs a description...
2015-04-11 11:15:56 +10:00
Andrew Bauer 0eeba1c514 don't check for perl packlist in f21 specfile 2015-04-10 15:36:57 -05:00
Isaac Connor 411b518b14 Merge pull request #774 from knnniggett/tmpfiles
Use tmpfiles.d to manage tmpdir and sockdir
2015-04-10 13:42:28 -04:00
Andrew Bauer 124ba1c2a8 Merge pull request #796 from ZoneMinder/zm_image_cleanups
one small fix for a log line where the 4th parameter wasn't included.  T...
2015-04-10 12:38:35 -05:00
Isaac Connor 05634f694a Merge pull request #781 from knnniggett/v4l_headers
Check for libv4l1-videodev headers
2015-04-10 13:30:15 -04:00
Isaac Connor 065a372678 one small fix for a log line where the 4th parameter wasn't included. The rest are very small optimisations. 2015-04-10 13:26:17 -04:00
Andrew Bauer fa633bff92 spelling 2015-04-10 12:17:06 -05:00
Andrew Bauer 0cf82a0b71 Allow user to override perl installation. Replace old perl cmake vars with new. 2015-04-10 12:09:01 -05:00
Isaac Connor 2db94d35f6 Merge pull request #795 from onlyjob/PBP
zmaudit.pl, zmcamtool.pl: pod2usage, PBP/5 + readability
2015-04-10 13:02:19 -04:00
Dmitry Smirnov 53907eeba1 zmcamtool.pl: readability 2015-04-11 00:35:40 +10:00
Dmitry Smirnov 90fa57788a zmcamtool.pl: pod2usage 2015-04-11 00:35:35 +10:00
Dmitry Smirnov 4dee542e99 zmcamtool.pl: tabs-to-spaces 2015-04-11 00:07:36 +10:00
Dmitry Smirnov 4bb8043fe5 zmaudit.pl: PBP/5 + readability 2015-04-10 20:34:17 +10:00
Dmitry Smirnov aeb3486322 zmaudit.pl: convert to pod2usage 2015-04-10 20:34:17 +10:00
Andrew Bauer e6631ebaf1 Propagate new perl changes to the ONVIF perl modules 2015-04-09 20:11:32 -05:00
Andrew Bauer ef21d08dd3 Update CMakeLists.txt
typo
2015-04-09 10:44:16 -05:00
Sune1337 5779b2e20f * use pthread_join instead of pthread_tryjoin_np 2015-04-08 22:15:54 +02:00
Isaac Connor c39984b228 Merge pull request #794 from onlyjob/PBP
as discussed...
2015-04-08 15:07:14 -04:00
Dmitry Smirnov 373b53f8f3 zmdc.pl: Usage() --> pod2usage() 2015-04-09 03:56:04 +10:00
Dmitry Smirnov 81860d99a6 zmdc.pl: PBP/5 + reformatting 2015-04-09 03:55:51 +10:00
abauer a2d9c0c042 Don't copy .in files into staging 2015-04-08 12:22:46 -05:00
Isaac Connor 577643ef09 Merge pull request #793 from SteveGilvarry/Leftover_Short_open
Leftover short open tags
2015-04-08 07:25:54 -04:00
SteveGilvarry 98d91ded90 Found some introduced short tags 2015-04-08 20:13:27 +10:00
SteveGilvarry 45fd7f1eca Found some old open tags left over 2015-04-08 20:11:26 +10: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
Andrew Bauer 549d7fd426 include libv4l1-videodev headers 2015-04-03 18:24:51 -05:00
Andrew Bauer 2331d731d1 cmake - update v4l header file check 2015-04-03 18:21:28 -05:00