Andy Bauer
|
160aa1cac4
|
check for polkit only if systemd is present
|
2017-02-04 15:34:57 -06:00 |
abishai
|
0f23809b35
|
rc.d is not require polkit
provide alternate path for mysql headers
|
2017-01-31 10:59:22 +03:00 |
Isaac Connor
|
9748b9346e
|
bump required version to 3.1 so that we can use a simple statement to turn on c++11 features
|
2017-01-08 16:52:16 -05:00 |
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
Andrew Bauer
|
1b81d790b2
|
rpm specfile consolidation
|
2016-12-23 13:06:44 -06:00 |
Andy Bauer
|
47b33917c4
|
bump minimum version of cmake
|
2016-12-23 08:56:10 -06:00 |
Isaac Connor
|
7f2bf04c2f
|
Merge branch 'cookie_http_only' into storageareas
|
2016-12-08 14:26:13 -05:00 |
Andy Bauer
|
9a694541ba
|
repm specfile maintenance: retire fc23, add fc25
|
2016-11-26 08:20:03 -06:00 |
Steve Gilvarry
|
0234e82396
|
Enable local and travis ccache
|
2016-07-24 09:26:10 +10:00 |
Andrew Bauer
|
f3583e5707
|
rpm specfile - add support for f24, remove support for f22
|
2016-06-24 15:39:57 -05:00 |
Isaac Connor
|
4045211b36
|
Have cmake take the version from the version file
|
2016-06-03 09:51:50 -04:00 |
Andy Bauer
|
6950e3385a
|
bump project to 1.30.0
|
2016-05-31 19:41:17 -05:00 |
Isaac Connor
|
02ef99584c
|
Revert "alter code to use libv4l2"
This reverts commit 00ef0f4d78 .
|
2016-09-29 09:30:12 -04:00 |
Isaac Connor
|
00ef0f4d78
|
alter code to use libv4l2
|
2016-09-28 08:43:41 -04:00 |
Isaac Connor
|
0d418882e7
|
sorta works
|
2016-09-23 15:39:52 -04:00 |
Steve Gilvarry
|
21c46bb519
|
Merge branch 'feature-h264-videostorage' into monitor_packetqueue
|
2016-08-11 00:52:35 +10:00 |
Steve Gilvarry
|
ea1ae815f1
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-08-05 23:03:06 +10:00 |
Steve Gilvarry
|
0425c68d59
|
Merge remote-tracking branch 'upstream/feature-h264-videostorage' into monitor_packetqueue
|
2016-08-02 20:17:35 +10:00 |
Steve Gilvarry
|
142784746c
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-07-07 19:33:04 +10:00 |
Isaac Connor
|
26bba58c56
|
Merge branch 'master' into feature-h264-videostorage
|
2016-06-17 11:09:47 -04:00 |
Steve Gilvarry
|
02013cef94
|
Merge remote-tracking branch 'upstream/feature-h264-videostorage' into packetqueue
|
2016-05-03 21:15:46 +10:00 |
Steve Gilvarry
|
f3ca10aac6
|
Starting to convert to boost.interprocess
|
2016-04-28 01:30:05 +10:00 |
Isaac Connor
|
709fc35167
|
Merge branch 'master' into icon_video
|
2016-04-06 11:49:40 -04:00 |
Andrew Bauer
|
ad13d889fe
|
bump version from 1.29.0 to 1.29.1
|
2016-04-06 09:30:47 -05:00 |
Andrew Bauer
|
9c5b47404d
|
Update CMakeLists.txt
|
2016-04-06 06:45:21 -05:00 |
Isaac Connor
|
9a795432cf
|
merge all the commits from the messed up iconnor_video branch
|
2016-04-05 17:14:46 -04:00 |
Isaac Connor
|
abcf48b65c
|
Merge branch 'master' into feature-h264-videostorage
|
2016-04-01 08:53:45 -04:00 |
Andrew Bauer
|
16992a44cb
|
add ZM_PERL_MM_PARMS
|
2016-03-11 15:56:29 -06:00 |
Andrew Bauer
|
b1d3be2cfc
|
add freeBSD cmake target distro
|
2016-03-11 07:38:29 -06:00 |
Andrew Bauer
|
1d478a3b1c
|
change linker flag to "-lexecinfo"
|
2016-03-10 15:00:21 -06:00 |
SteveGilvarry
|
3ce620eb89
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-02-27 19:46:56 +11:00 |
Andrew Bauer
|
308d98955e
|
By default, enable ONVIF discovery support
|
2016-02-08 14:05:06 -06:00 |
SteveGilvarry
|
7301e803ed
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
|
2016-01-30 15:45:08 +11:00 |
Andrew Bauer
|
99b65f0191
|
Update CMakeLists.txt
|
2016-01-01 13:39:48 -06:00 |
Isaac Connor
|
8e25b80252
|
bump version due to db change adding ServerId to Logs
|
2015-12-31 10:14:20 -05:00 |
SteveGilvarry
|
e28e3c2b75
|
Merge branch 'master' into feature-h264-videostorage
|
2015-12-20 14:13:30 +11:00 |
Andrew Bauer
|
1957c5672f
|
Check for the presence of CrudControllerTrait.php instead of .git
|
2015-12-04 12:03:18 -06:00 |
Steve Gilvarry
|
d9e8f74298
|
Merge pull request #1173 from knnniggett/submodule
Error on missing submodules
|
2015-11-29 13:22:30 +11:00 |
SteveGilvarry
|
220ee5e516
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2015-11-29 13:17:22 +11:00 |
Andrew Bauer
|
91f700a7cd
|
Update CMakeLists.txt
|
2015-11-23 10:10:56 -06:00 |
Andy Bauer
|
dabe32a593
|
Error on missing submodules
|
2015-11-21 18:21:18 -06:00 |
Andy Bauer
|
cbfdc5d88d
|
rpm packaging updates
|
2015-11-21 15:23:13 -06:00 |
Isaac Connor
|
f322bde35c
|
increase version to 109 because I at some point pushed a db update script
|
2015-11-16 11:01:11 -05:00 |
Heng Liu
|
4e263f5913
|
Merge branch 'master' into feature-h264-videostorage
Conflicts:
src/zm_ffmpeg.h
|
2015-11-04 14:39:52 -08:00 |
Isaac Connor
|
2115eacdd0
|
revert change to not overwite zm.conf. It's not right, and it is screwing up package building
|
2015-10-30 11:28:34 -04:00 |
SteveGilvarry
|
d8494aba2d
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
|
2015-10-23 22:07:22 +11:00 |
Kyle Johnson
|
9dcb3e1df3
|
Add Index to Frames table. Fixes #1085.
|
2015-10-22 11:40:25 -06:00 |
Isaac Connor
|
da764a605b
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2015-10-02 13:37:56 -04:00 |
baffo32
|
eecfb80292
|
Fix faulty zm.conf.new install line
|
2015-10-11 22:41:57 -04:00 |
Andrew Bauer
|
3242cde0bf
|
move zm.conf under /etc/zm for Fedora
|
2015-10-03 13:38:51 -05:00 |
Andrew Bauer
|
6861ea00d2
|
Add Fedora 22 Target Distro
|
2015-10-03 12:40:34 -05:00 |
Isaac Connor
|
2be61906a4
|
add checks for execinfo library
|
2015-10-02 13:37:50 -04:00 |
Isaac Connor
|
796bad55a3
|
install zm.conf as zm.conf.new if zm.conf already exists
|
2015-10-02 12:54:25 -04:00 |
Isaac Connor
|
fc6a6aeaa3
|
Don't install zm.conf if it already exists
|
2015-10-02 11:27:35 -04:00 |
Kyle Johnson
|
b94a148559
|
Bump version
|
2015-09-29 14:28:54 -06:00 |
Andy Bauer
|
4a04d0411b
|
bump version to 1.28.106
|
2015-08-29 08:00:02 -05:00 |
Andy Bauer
|
395e628541
|
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
Conflicts:
CMakeLists.txt
configure.ac
version
|
2015-08-29 07:57:18 -05:00 |
Andy Bauer
|
4fdd32b596
|
bump version to 1.28.106
|
2015-08-29 07:53:08 -05:00 |
Andrew Bauer
|
9abc161995
|
bump version to 1.28.105
|
2015-08-21 10:33:42 -05:00 |
Robin Daermann
|
fbcd6f365b
|
Change database schema (add 'Blacken' zone type) and bump version to 1.28.105
|
2015-08-20 16:17:08 +02:00 |
Andrew Bauer
|
fe3595bfa1
|
Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval
Conflicts:
CMakeLists.txt
configure.ac
db/zm_update-1.28.101.sql
src/zm_monitor.cpp
src/zm_monitor.h
version
|
2015-08-18 20:20:53 -05:00 |
Robin Daermann
|
55eee8d6a4
|
Added SQL changes to zm_create.sql.in
Bumped version to 1.28.103 as requested
|
2015-08-17 15:05:17 +02:00 |
Robin Daermann
|
0547a66870
|
Bump version to 1.28.102
|
2015-08-17 13:40:30 +02:00 |
Robin Daermann
|
7f3a07f21b
|
Add label size to monitor options (database and backend part)
This commit bumps version to 1.28.101 because of database schema change
|
2015-08-10 15:35:18 +02:00 |
SteveGilvarry
|
f09a551d6a
|
Merge branch 'master' into feature-h264-videostorage
|
2015-07-28 21:06:52 +10:00 |
Emmanuel Papin
|
132e0a1798
|
Add analysis fps paramter to monitors
|
2015-07-22 21:38:35 +02:00 |
Isaac Connor
|
47be582354
|
bump version to 1.28.100
|
2015-07-14 16:11:27 -04:00 |
Isaac Connor
|
376912158c
|
bump version to 1.28.99 so that dbupdate scripts actually run
|
2015-07-07 15:47:45 -04:00 |
Isaac Connor
|
58448adb51
|
Merge pull request #896 from knnniggett/pod2man
Generate man pages for perl scripts & C Binaries in the bin folder
|
2015-07-03 11:40:24 -04:00 |
Isaac Connor
|
e0da473449
|
add check for gettime in librt, needed for building on pi
|
2015-07-03 10:53:23 -04:00 |
Andrew Bauer
|
3f6333a33d
|
modify polkit checks & move host os check
|
2015-06-25 08:01:24 -05:00 |
Bill McGonigle
|
ec1c3cfed0
|
Add cmake ffmpeg include path hint for distros that put headers in include/ffmpeg.
|
2015-06-24 01:39:26 -04:00 |
Andrew Bauer
|
fa835359a1
|
Add install target for C binary man pages
|
2015-06-20 17:33:13 -05:00 |
Isaac Connor
|
dcb7b1d259
|
Merge pull request #883 from pliablepixels/881-bootstrap-loading-config
881 bootstrap loading config
|
2015-06-14 14:43:01 -04:00 |
SteveGilvarry
|
22ec67dd3f
|
Find avconv as alternative to ffmpeg
|
2015-06-14 16:51:31 +10:00 |
pliablepixels
|
11bd2139f4
|
Added API version in addition to ZM version
|
2015-06-13 16:30:28 +00:00 |
SteveGilvarry
|
9b06b1399c
|
Merge branch 'master' into feature-h264-videostorage
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
src/zm_ffmpeg_camera.cpp
web/skins/classic/views/event.php
web/skins/classic/views/monitor.php
web/skins/classic/views/timeline.php
|
2015-06-10 23:09:30 +10:00 |
Andrew Bauer
|
e8ecc505ed
|
fix error
|
2015-05-20 17:23:41 -05:00 |
Andrew Bauer
|
47012c58de
|
Check the Host OS, similar to configure.ac
|
2015-05-20 17:20:44 -05:00 |
SteveGilvarry
|
d96c952047
|
Merge branch 'master' into Cmakelists_CleanUp
Conflicts:
CMakeLists.txt
|
2015-05-19 21:12:34 +10:00 |
Andrew Bauer
|
d5e403b7e0
|
Merge pull request #775 from ZoneMinder/freebsd_fixes
Freebsd fixes
|
2015-04-17 15:21:42 -05:00 |
Isaac Connor
|
1668949f18
|
Merge pull request #792 from knnniggett/perl
cmake - use perl INSTALLDIRS
|
2015-04-15 11:07:14 -04: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 |
Isaac Connor
|
05634f694a
|
Merge pull request #781 from knnniggett/v4l_headers
Check for libv4l1-videodev headers
|
2015-04-10 13:30:15 -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 |
Andrew Bauer
|
ef21d08dd3
|
Update CMakeLists.txt
typo
|
2015-04-09 10:44:16 -05:00 |
Andrew Bauer
|
2331d731d1
|
cmake - update v4l header file check
|
2015-04-03 18:21:28 -05:00 |
Isaac Connor
|
199c94e7db
|
Add Sendfile checks for cmake
|
2015-03-31 23:07:19 -04:00 |
SteveGilvarry
|
b3313edde0
|
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
Conflicts:
web/skins/classic/views/event.php
|
2015-03-21 23:49:56 +11:00 |
Andrew Bauer
|
4182fb3295
|
Don't show ONVIf probe link when ONVIF support is not enabled
|
2015-02-21 11:12:07 -06:00 |
Andrew Bauer
|
e2b3e7c705
|
Replace support for Fedora 19 with support for Fedora 21
|
2015-02-21 09:01:56 -06:00 |
SteveGilvarry
|
240d97b17a
|
Removed el6 from endif arguments as some versions of Cmake want if and endif arguments to match
|
2015-02-21 20:50:00 +11:00 |
Andrew Bauer
|
568fea61fa
|
Merge pull request #704 from clipo1979/master
Make el6 and el7 build process a little more automated
|
2015-02-19 19:18:26 -06:00 |
Andy Bauer
|
9f3ff787d1
|
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
|
2015-02-18 18:53:47 -06:00 |
Andy Bauer
|
77f554f7ba
|
bump verion to 1.28.1 in master
|
2015-02-18 18:24:26 -06:00 |
SteveGilvarry
|
79c82ea880
|
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
|
2015-02-17 23:16:42 +11:00 |
Andrew Bauer
|
e3351441c7
|
fix cmake error, rename init script to zoneminder, modify el6 target distro
|
2015-02-15 15:59:58 -06:00 |
clipo1979
|
0991391f45
|
Update CMakeLists.txt
|
2015-02-15 11:34:27 +00:00 |
Andrew Bauer
|
8da2e0a667
|
Update CMakeLists.txt
ZM_CONFIG was overwriting itself
|
2015-02-13 07:29:21 -06:00 |