Isaac Connor
|
962d74f6a7
|
blah
|
2015-12-22 11:38:36 -05:00 |
|
Isaac Connor
|
eccfced6d4
|
Merge branch 'multi-server' into newpointone
Conflicts:
distros/ubuntu1204/apache.conf
|
2015-12-22 09:54:13 -05:00 |
|
Isaac Connor
|
64f1475058
|
blah
|
2015-12-22 09:47:35 -05:00 |
Isaac Connor
|
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 |
|
Isaac Connor
|
f6fd4671fe
|
make zmfilter aware of StorageAreas
|
2015-12-21 12:40:39 -05:00 |
|
Isaac Connor
|
fc981e063e
|
snap release adding zmvideo
|
2015-12-21 10:01:55 -05:00 |
|
Isaac Connor
|
f4debc203d
|
Only run zmupdate.pl if the mysql db is located here
|
2015-12-20 12:23:40 -05:00 |
|
Isaac Connor
|
9743bad13f
|
Add a valid config if a person is using mod_fcgid instead of mod_php
|
2015-12-20 12:21:18 -05:00 |
|
Isaac Connor
|
4ef35c8c70
|
No need for a cgi-bin link
|
2015-12-20 11:23:01 -05:00 |
|
Isaac Connor
|
9c2707deba
|
update paths to /usr/share/zoneminder/www and /usr/lib/zoneminder/cgi-bin
|
2015-12-20 11:22:12 -05:00 |
|
Isaac Connor
|
623c8a14b0
|
add multi-package build for 14.04
|
2015-12-18 14:16:45 -05:00 |
|
Isaac Connor
|
14cde582cf
|
Merge branch 'multi-server' into multiserverplusstorage
Conflicts:
src/zm_monitor.h
|
2015-12-14 16:55:26 -05:00 |
|
Isaac Connor
|
b2b1afa8ad
|
Merge master
|
2015-12-14 15:49:32 -05:00 |
|
Isaac Connor
|
b21b26a41b
|
remove requirment for mysql. Mysql could be on another machine
|
2015-12-09 12:34:16 -05:00 |
|
Isaac Connor
|
af59dbee2e
|
== should be =
|
2015-12-04 10:40:55 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
7514f43ef4
|
only update db if db is local
|
2015-11-27 13:54:31 -05:00 |
|
Isaac Connor
|
f7cc2fb44f
|
Merge branch 'master' into multi-server
Conflicts:
src/zm_monitor.cpp
|
2015-11-23 10:42:14 -05:00 |
|
Isaac Connor
|
7d97ecb9c9
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2015-11-23 10:40:08 -05:00 |
Andy Bauer
|
cbfdc5d88d
|
rpm packaging updates
|
2015-11-21 15:23:13 -06:00 |
|
Andy Bauer
|
e65f91d404
|
update rpm documentation
|
2015-11-21 15:18:43 -06:00 |
|
Isaac Connor
|
4d6c4355db
|
Merge branch 'master' into multi-server
|
2015-11-20 16:07:50 -05:00 |
|
Isaac Connor
|
37b041b561
|
add index to recommended default permissions on zmuser
|
2015-11-20 16:00:57 -05:00 |
|
Andy Bauer
|
9052274d0d
|
Update rpm documentation to reference index permission
|
2015-11-17 12:20:51 -06:00 |
|
Isaac Connor
|
e00049f17a
|
change format to native
|
2015-11-16 09:30:09 -05:00 |
|
Isaac Connor
|
d5cc602bfa
|
Merge branch 'master' into multi-server
|
2015-11-09 12:36:34 -05:00 |
|
Isaac Connor
|
16274e46bc
|
grant create,index to zmuser when updating
|
2015-11-09 12:36:26 -05:00 |
|
Isaac Connor
|
ac76d224b8
|
grant create,index to zmuser when updating
|
2015-11-09 12:36:23 -05:00 |
|
Isaac Connor
|
82edfc2f16
|
grant create,index to zmuser when updating
|
2015-11-09 12:34:24 -05:00 |
|
Isaac Connor
|
6b994132f1
|
grant create,index to zmuser when updating
|
2015-11-09 12:34:11 -05:00 |
|
Isaac Connor
|
b28a562f1b
|
Merge branch 'master' into multi-server
|
2015-10-30 12:32:42 -04:00 |
|
Isaac Connor
|
920bea8deb
|
split up depends into multiple lines
|
2015-10-30 12:19:43 -04:00 |
|
Isaac Connor
|
589ee2f37b
|
split up depends into multiple lines
|
2015-10-30 12:19:35 -04:00 |
|
Isaac Connor
|
a45a52601d
|
change format to native, which makes building packages so much easier
|
2015-10-30 12:19:12 -04:00 |
|
Isaac Connor
|
029044bca3
|
merge master, bump version
|
2015-10-23 16:14:49 -04:00 |
|
Isaac Connor
|
e37cf0e218
|
append /www to docroot for all debian/ubuntu dists
|
2015-10-23 16:08:32 -04:00 |
Isaac Connor
|
d0e5dd62b5
|
Merge pull request #1103 from seebaer1976/patch-6
Update preinst
|
2015-10-16 12:06:44 -04:00 |
|
Isaac Connor
|
582cbe7567
|
Merge branch 'master' into multi-server
|
2015-10-15 09:01:19 -04:00 |
seebaer1976
|
7ebf3de8a2
|
Update preinst
korrektur
|
2015-10-09 18:13:13 +02:00 |
|
Isaac Connor
|
8db4c22192
|
Merge pull request #1100 from seebaer1976/patch-2
Update links
|
2015-10-09 09:23:32 -04:00 |
|
Isaac Connor
|
729e9536d7
|
Merge pull request #1101 from seebaer1976/patch-4
Update rules
|
2015-10-09 09:23:13 -04:00 |
|
Isaac Connor
|
79078f8308
|
Merge pull request #1102 from seebaer1976/patch-5
Update apache.conf
|
2015-10-09 09:22:55 -04:00 |
|
seebaer1976
|
b17819d181
|
Update apache.conf
Update links
|
2015-10-09 13:50:15 +02:00 |
|
seebaer1976
|
b042152694
|
Update rules
update links
|
2015-10-09 13:48:26 +02:00 |
|
seebaer1976
|
4284f8b089
|
Update preinst
Update links
|
2015-10-09 13:45:19 +02:00 |
|
seebaer1976
|
23a6000380
|
Update links
Update links
|
2015-10-09 13:41:02 +02:00 |
|
Andy Bauer
|
b74abe88c9
|
minor centos 7 specfile change
|
2015-10-03 17:07:22 -05:00 |
Andrew Bauer
|
3242cde0bf
|
move zm.conf under /etc/zm for Fedora
|
2015-10-03 13:38:51 -05:00 |
|
Andrew Bauer
|
4fb2bcb393
|
Fedora specfile changes
|
2015-10-03 13:21:58 -05:00 |
|
Andrew Bauer
|
e8c4adbcca
|
Use make macros inside Fedora config files rather than hardcode
|
2015-10-03 12:54:18 -05:00 |