1ff2043774
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-12-23 19:24:08 +11:00
962d74f6a7
blah
2015-12-22 11:38:36 -05:00
eccfced6d4
Merge branch 'multi-server' into newpointone
...
Conflicts:
distros/ubuntu1204/apache.conf
2015-12-22 09:54:13 -05:00
64f1475058
blah
2015-12-22 09:47:35 -05:00
b33c0764fe
update to new cgi-bin path
2015-12-21 12:59:52 -05:00
dfd7986c01
Merge branch 'master' into multi-server
...
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
f6fd4671fe
make zmfilter aware of StorageAreas
2015-12-21 12:40:39 -05:00
fc981e063e
snap release adding zmvideo
2015-12-21 10:01:55 -05:00
f4debc203d
Only run zmupdate.pl if the mysql db is located here
2015-12-20 12:23:40 -05:00
9743bad13f
Add a valid config if a person is using mod_fcgid instead of mod_php
2015-12-20 12:21:18 -05:00
4ef35c8c70
No need for a cgi-bin link
2015-12-20 11:23:01 -05:00
9c2707deba
update paths to /usr/share/zoneminder/www and /usr/lib/zoneminder/cgi-bin
2015-12-20 11:22:12 -05:00
623c8a14b0
add multi-package build for 14.04
2015-12-18 14:16:45 -05:00
14cde582cf
Merge branch 'multi-server' into multiserverplusstorage
...
Conflicts:
src/zm_monitor.h
2015-12-14 16:55:26 -05:00
b2b1afa8ad
Merge master
2015-12-14 15:49:32 -05:00
b21b26a41b
remove requirment for mysql. Mysql could be on another machine
2015-12-09 12:34:16 -05:00
af59dbee2e
== should be =
2015-12-04 10:40:55 -05:00
70fb6a6786
output message when not doing dbupdate. put quotes in to fix bash error when ZM_DB_HOST is not defined
2015-12-02 11:17:23 -05:00
220ee5e516
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-11-29 13:17:22 +11:00
7514f43ef4
only update db if db is local
2015-11-27 13:54:31 -05:00
f7cc2fb44f
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-11-23 10:42:14 -05:00
7d97ecb9c9
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-11-23 10:40:08 -05:00
cbfdc5d88d
rpm packaging updates
2015-11-21 15:23:13 -06:00
e65f91d404
update rpm documentation
2015-11-21 15:18:43 -06:00
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
37b041b561
add index to recommended default permissions on zmuser
2015-11-20 16:00:57 -05:00
9052274d0d
Update rpm documentation to reference index permission
2015-11-17 12:20:51 -06:00
e00049f17a
change format to native
2015-11-16 09:30:09 -05:00
d5cc602bfa
Merge branch 'master' into multi-server
2015-11-09 12:36:34 -05:00
16274e46bc
grant create,index to zmuser when updating
2015-11-09 12:36:26 -05:00
ac76d224b8
grant create,index to zmuser when updating
2015-11-09 12:36:23 -05:00
82edfc2f16
grant create,index to zmuser when updating
2015-11-09 12:34:24 -05:00
6b994132f1
grant create,index to zmuser when updating
2015-11-09 12:34:11 -05:00
4e263f5913
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg.h
2015-11-04 14:39:52 -08:00
b28a562f1b
Merge branch 'master' into multi-server
2015-10-30 12:32:42 -04:00
920bea8deb
split up depends into multiple lines
2015-10-30 12:19:43 -04:00
589ee2f37b
split up depends into multiple lines
2015-10-30 12:19:35 -04:00
a45a52601d
change format to native, which makes building packages so much easier
2015-10-30 12:19:12 -04:00
d45cf9607b
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-10-28 08:12:46 +11:00
029044bca3
merge master, bump version
2015-10-23 16:14:49 -04:00
e37cf0e218
append /www to docroot for all debian/ubuntu dists
2015-10-23 16:08:32 -04:00
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
d0e5dd62b5
Merge pull request #1103 from seebaer1976/patch-6
...
Update preinst
2015-10-16 12:06:44 -04:00
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
7ebf3de8a2
Update preinst
...
korrektur
2015-10-09 18:13:13 +02:00
8db4c22192
Merge pull request #1100 from seebaer1976/patch-2
...
Update links
2015-10-09 09:23:32 -04:00
729e9536d7
Merge pull request #1101 from seebaer1976/patch-4
...
Update rules
2015-10-09 09:23:13 -04:00
79078f8308
Merge pull request #1102 from seebaer1976/patch-5
...
Update apache.conf
2015-10-09 09:22:55 -04:00
b17819d181
Update apache.conf
...
Update links
2015-10-09 13:50:15 +02:00
b042152694
Update rules
...
update links
2015-10-09 13:48:26 +02:00
4284f8b089
Update preinst
...
Update links
2015-10-09 13:45:19 +02:00
23a6000380
Update links
...
Update links
2015-10-09 13:41:02 +02:00
b74abe88c9
minor centos 7 specfile change
2015-10-03 17:07:22 -05:00
3242cde0bf
move zm.conf under /etc/zm for Fedora
2015-10-03 13:38:51 -05:00
4fb2bcb393
Fedora specfile changes
2015-10-03 13:21:58 -05:00
e8c4adbcca
Use make macros inside Fedora config files rather than hardcode
2015-10-03 12:54:18 -05:00
6861ea00d2
Add Fedora 22 Target Distro
2015-10-03 12:40:34 -05:00
269e9bd475
Configure Fedora packages for HTTPS
2015-10-03 12:35:22 -05:00
a79d0fc502
update README.fedora
2015-10-03 11:04:58 -05:00
9fae2bdf67
symlink README.https into Fedora folder
2015-10-03 10:45:41 -05:00
d6667100b4
Merge pull request #1084 from ZoneMinder/tz
...
Tz
2015-10-13 07:19:45 -05:00
4edf997791
change docroot to /usr/share/zoneminder/www and cgi-bin to /usr/lib/zoneminder/cgi-bin
2015-10-02 12:32:12 +00:00
c9d7087c91
Setting the TZ ENV variable prevents every gettimeofday call from reading /etc/timezone
2015-10-01 11:47:12 -04:00
2d749f0b66
Setting the TZ ENV variable prevents every gettimeofday call from reading /etc/timezone
2015-10-01 11:46:51 -04:00
07348d4321
don't need apache patch anymore
2015-09-29 08:50:50 -04:00
e97341ced5
Merge pull request #1054 from knnniggett/cambozola
...
link to cambozola pacakge, rather than download during build
2015-09-14 14:02:10 -05:00
e88d63cb35
need to check the case of having a / at the end
2015-09-14 14:55:37 -04:00
03172af921
link to cambozola pacakge, rather than download during build
2015-09-14 13:51:48 -05:00
3f3c637227
don't need apache patch anymore
2015-09-14 14:36:19 -04:00
407ed7ec66
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-09-14 14:14:23 -04:00
6e47812669
This patch is no longer needed
2015-09-14 14:14:13 -04:00
c8fecee68b
Update CMakeLists.txt
...
nbtelecom was returning http 403. switching to skylineservers. In the future, I will add jscalendar packages to zmreop as that is better practice.
2015-09-12 18:03:20 -05:00
0ff14008b3
Update zoneminder.el6.conf.in
...
ScriptAlias should point to ZM_CGIDIR instead of ZM_WEBDIR
2015-09-12 17:49:03 -05:00
ebb6e7158a
rpm packaging changes for centos 6
2015-09-08 18:16:19 -05:00
427c71f5e8
Update README.Centos7
2015-09-07 16:54:13 -05:00
41cfadbcb1
Update zoneminder.el7.spec
...
typo
2015-09-07 16:14:58 -05:00
dc9a5b13fe
redhat rpm packaging modifications
2015-09-07 15:50:42 -05:00
9320efdd45
rpm specfile - modify symlinks
2015-08-29 18:04:26 -05:00
4ddeddeb32
rpm specfile - correct typo
2015-08-29 17:28:06 -05:00
4915b7fc72
rpm spec file - create cakephp tmp folder symlink
2015-08-29 16:52:16 -05:00
d9c3061b52
Add reference to mysql Create permission in rpm README's
2015-08-29 14:01:45 -05:00
ef8830b373
Update zoneminder.el6.spec
...
rpm specfile - update location of perl packlist
2015-08-29 11:12:55 -05:00
3ff9c38a2e
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-08-20 20:36:21 -04:00
8e01dad828
add the api tmp link
2015-08-20 20:36:09 -04:00
6a1bbd2055
remove systemd overrides
2015-08-20 13:49:04 -04:00
96a710671d
add the api tmp dir link to /tmp/zm
2015-08-19 16:23:36 -04:00
daba109e7d
set AllowOverride All for api dir
2015-08-19 16:09:03 -04:00
492cafe08e
set AllowOverride All for api dir
2015-08-19 16:08:48 -04:00
e4f1795fa4
1404 doesn't have 3.9.6, so go back to 3.9.4
2015-08-19 13:35:06 -04:00
93e948e0d8
these links need to move under www to work
2015-08-19 13:31:56 -04:00
4767a6fb38
remove systemd, and extra Standards-Version
2015-08-18 14:01:56 -04:00
16897b7c94
rough in ubuntu1204 version of cmake build
2015-08-18 11:57:56 -04:00
3b3ae0adf5
This will be used from now on when generating master snapshots for ubuntu1504 for a single zoneminder.deb
...
It was taken from the debian official package on August 17th 2015. Various unneeded patches were removed
and the dependencies were change to use the ffmpeg version of av libraries. Also, since ubuntu1504 does not have cakephp 2 available
we cannot use a packaged version of that, so we still need our own copy for the api
2015-08-17 14:03:27 -04:00
8e491475d1
typos and whitespace fixes
2015-08-16 12:45:45 -04:00
b69fd1e86d
configure apache to follow symlinks so it find nph-zms
2015-08-13 20:23:52 -05:00
af5fd5890b
Fix redalert.wav symlinks
2015-08-10 08:13:37 -05:00
1e60fccd81
Cherry-Pick from iconnor - make it compile on ubuntu 15.04. Which is libav 56.1.0
...
Conflicts:
src/zm_ffmpeg.cpp
src/zm_remote_camera_rtsp.cpp
Conflicts:
distros/ubuntu1204/changelog
2015-07-28 21:39:47 +10:00
b90d8c4f73
db_get fails if there is no debconf entry (for example if the package is not yet configured)
2015-07-23 15:08:06 -04:00
27ef821a4f
db_get fails if there is no debconf entry (for example if the
...
package is not yet configured)
2015-07-23 15:07:32 -04:00
fffea54ed1
Merge pull request #944 from ZoneMinder/php-gd
...
add php-gd to list of dependencies for debian and ubuntu builds
2015-07-16 13:08:33 -05:00
424b7d50bd
php-gd should isntead be php5-gd
2015-07-16 13:59:06 -04:00
e3042c59a5
add php-gd to list of dependencies for debian and ubuntu builds
2015-07-16 13:40:16 -04:00
eb5bb641d6
rpm packaging - require php-gd
2015-07-16 12:15:24 -05:00
09efee3be3
limit man install to 8 to not conflict with man pages in libzoneminder-perl
2015-07-15 15:46:53 -04:00
2f3779473b
release SNAPSHOT2015071501
2015-07-15 15:45:02 -04:00
4f0466739f
remove generated .debhelpers
2015-07-15 12:04:00 -04:00
7a08127d21
release snapshot 2015071501
2015-07-15 12:02:20 -04:00
c7e30436be
cleanup and add usr/share/man to core install dirs so that man files get installed
2015-07-13 11:31:23 -04:00
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
956e2936a3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-06-25 16:26:49 -04:00
e3727af243
softlayer-dal appears to defunct as a sourceforge mirror. Get jscalendar from nbtelcom instead.
2015-06-24 01:32:53 -04:00
d03469125a
Add perl-podlators build dependency to redhat distros
2015-06-20 18:07:29 -05:00
69cdce22e1
cleanout build files
2015-06-19 12:04:09 -04:00
99384983a5
merge from recent ubuntu1504 switch to ffmpeg version of av libs
2015-06-18 13:09:42 -04:00
03de98980f
cleanup log
2015-06-12 11:53:08 -04:00
18674b7973
cleanup
2015-06-12 11:51:43 -04:00
7759e57776
update changelog to match last snapshot
2015-06-12 11:50:10 -04:00
106d543367
add ubuntu15.04 using cmake with split packages
2015-06-12 11:20:24 -04:00
3266b0b57e
change for systemd
2015-05-24 22:13:09 +02:00
3080ecdb20
add service and temp files
2015-05-24 22:09:43 +02:00
a671b452a8
change dependencies for ubuntu 15.04
2015-05-24 22:05:09 +02:00
f45af08947
copy ubutnu1204 without init.d
2015-05-24 22:01:51 +02:00
e127228233
Update zoneminder.el7.spec
...
some documentation was not being packaged and neither was the selinux policy file
2015-05-07 18:13:33 -05:00
cbbe40ea1c
Update zoneminder.el7.spec
...
Recent perl changes place the .packlist file under a different folder on CentOS 7
2015-05-07 17:56:04 -05:00
1668949f18
Merge pull request #792 from knnniggett/perl
...
cmake - use perl INSTALLDIRS
2015-04-15 11:07:14 -04:00
0eeba1c514
don't check for perl packlist in f21 specfile
2015-04-10 15:36:57 -05:00
411b518b14
Merge pull request #774 from knnniggett/tmpfiles
...
Use tmpfiles.d to manage tmpdir and sockdir
2015-04-10 13:42:28 -04:00
0cf82a0b71
Allow user to override perl installation. Replace old perl cmake vars with new.
2015-04-10 12:09:01 -05:00
a3637b9eed
Add libv4l-devel as a build req for el7, f20, & f21
2015-04-03 17:41:46 -05:00
c0af30bdf1
fix permissions on config file
2015-03-31 20:45:12 -05:00
7802089b82
Use tmpfiles.d to manage tmpdir and sockdir
2015-03-31 20:30:27 -05:00
75cfc3f0cd
bump release
2015-03-02 17:16:00 -05:00
098e66951e
remove netpbm from debian packaging
2015-03-02 17:15:27 -05:00
111e75e8e9
add psmisc pacakge requirement to rpm specfiles
2015-02-23 08:09:48 -06:00
397bc57692
Update zoneminder.el6.spec
2015-02-23 07:18:32 -06:00
7d747b72d7
bump version for el6 and f20 specfiles
2015-02-23 07:12:57 -06:00
42744f4359
Update zoneminder.f21.spec
...
bump version in cmake flag
2015-02-21 09:17:16 -06:00
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
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
22b73c1610
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-02-18 16:32:06 -05:00
e3351441c7
fix cmake error, rename init script to zoneminder, modify el6 target distro
2015-02-15 15:59:58 -06:00
18abb3761d
Update CMakeLists.txt
2015-02-15 15:50:21 +00:00
e762a615d3
Rename zoneminder.el6.conf to zoneminder.el6.conf.in
2015-02-15 15:48:40 +00:00
c6f256fef4
Rename zoneminder.el6.logrotate to zoneminder.el6.logrotate.in
2015-02-15 15:48:14 +00:00
aa00de486b
Rename zoneminder.el7.logrotate to zoneminder.el7.logrotate.in
2015-02-15 15:47:42 +00:00
200f48da34
Rename zoneminder.tmpfiles to zoneminder.tmpfiles.in
2015-02-15 15:46:00 +00:00
4fc4789b08
Update zoneminder.el6.conf
2015-02-15 14:23:28 +00:00
813de8540f
Update zoneminder.el6.logrotate
2015-02-15 14:21:16 +00:00
160503df14
Update zoneminder.el7.logrotate
2015-02-15 14:20:23 +00:00
6b8ce2e0d4
Rename zoneminder.in to zm.in
2015-02-15 14:06:54 +00:00
SteveGilvarry
Isaac Connor
Isaac Connor
Andy Bauer
Heng Liu
Isaac Connor
seebaer1976
Andrew Bauer
Isaac Connor
Isaac Connor
Bill McGonigle
Sebastian Kaminski
clipo1979