02a56b811b
Don't be recursive when chowning /var/cache/zoneminder
2016-04-20 14:38:51 -04:00
060df90ff3
bump versions
2016-04-20 09:38:07 -04:00
7e1a80658b
Merge branch 'master' into storageareas
2016-04-17 09:30:33 -04:00
d424a297c4
need php5-gd
2016-04-17 09:29:55 -04:00
3f27f4893c
Merge branch 'fix_grant' into storageareas
2016-04-15 12:55:13 -04:00
78c6e14e0c
Merge branch 'master' into storageareas
2016-04-09 14:52:28 -04:00
dafdf1a289
rpm specfile changes
2016-04-08 19:22:27 -05:00
e473839704
substitute ZM_DB_NAME,ZM_DB_USER and ZM_DB_PASS from zm.conf for defaults
2016-04-06 15:50:51 -04:00
3dd010b40a
User and and instead of defaults
2016-04-06 15:44:56 -04:00
6cdbcfc9e6
add back identified by
2016-04-06 13:55:18 -04:00
6199a54838
more work, check for local db, check for existence of mysql, sync up between debian ubuntu1204 ubuntu1504
2016-04-06 13:45:46 -04:00
699b6458d5
bring up to date with debian postinst. Will not install the db, create the user and will run zmupdate.
2016-04-06 13:08:30 -04:00
cf76360ecb
bring up to date with the one in debian
2016-04-06 13:03:24 -04:00
fb05e1baad
grant requires rights regardless of password
2016-04-06 13:01:20 -04:00
59a8b37df2
Merge branch 'master' into storageareas
2016-04-06 11:47:20 -04:00
765f79a87f
Merge branch 'icon_video' into storageareas
2016-04-06 11:16:38 -04:00
3e5a4b6481
remove autotools builds, replace them with cmake versions
2016-04-06 08:43:20 -04:00
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
f73d8be765
Merge branch 'master' into feature-h264-videostorage
2016-04-05 09:43:34 -04:00
238a25a302
Merge branch 'master' into iconnor_video
2016-04-05 09:38:59 -04:00
0f1a530891
ciontrol files need spaces on multi-line lines
2016-04-05 09:03:37 -04:00
4d7ded5ef0
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
configure.ac
src/Makefile.am
web/js/Makefile.am
2016-04-05 22:06:14 +10:00
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
82b32578ec
Merge branch 'master' into iconnor_video
2016-04-01 12:54:09 -04:00
abcf48b65c
Merge branch 'master' into feature-h264-videostorage
2016-04-01 08:53:45 -04:00
56d95bb949
Merge branch 'iconnor_video' into storageareas
2016-03-31 14:02:56 -04:00
74301b3ff3
Add the dependencies for libmp4v2
2016-03-31 11:53:36 -04:00
c9a1a9020d
Merge h264
2016-03-31 11:03:36 -04:00
e5a36c02bd
Merge remote-tracking branch 'origin/master' into video_remote
2016-03-30 16:55:24 -04:00
55e237fd3f
tabs to spaces, add back perl modules to Builds-Depends
2016-03-30 11:10:54 -04:00
ea49dc20d1
Merge branch 'master' into storageareas
2016-03-30 10:58:07 -04:00
b81395843c
fix spacing in control file
2016-03-30 10:56:10 -04:00
f0a307e082
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
...
Conflicts:
distros/ubuntu1504_cmake/control
2016-03-29 11:53:17 -04:00
e4d0f2ffda
fixup depends
2016-03-29 11:50:51 -04:00
7f34a0df37
Remove deprecated --enable-crashtrace
2016-03-29 11:48:30 -04:00
3a8352eb6b
Merge branch 'master' into storageareas
2016-03-21 10:25:03 -04:00
06e04127d6
Fix spelling in other README files as well
2016-03-18 23:27:43 +00:00
94057a94ff
Fix spelling of 'environment'
2016-03-18 22:42:34 +00:00
688dd67697
Merge branch 'add_onvif_deps' into storageareas
2016-03-09 11:18:35 -05:00
ee0c134a9b
need spaces at beginning of lien
2016-03-09 11:18:27 -05:00
740dc12f7c
remove extra comma
2016-03-09 11:17:50 -05:00
24ebc33ea4
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-03-09 20:54:11 +11:00
9647a680f6
Merge branch 'add_onvif_deps' into storageareas
2016-03-08 16:06:30 -05:00
094b041c43
There must be spaces before the comma
2016-03-08 16:06:16 -05:00
f8582ad9b6
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:56:26 -05:00
c27387610c
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:56:17 -05:00
b0835660b1
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:56:08 -05:00
12a277912e
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:56:01 -05:00
cf1d475dbb
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:55:56 -05:00
b9996b4fc0
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:55:37 -05:00
cfbf2cced1
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:55:29 -05:00
455c268a0c
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:55:11 -05:00
172b687ab3
Merge branch 'add_onvif_deps' into storageareas
2016-03-07 22:18:39 -05:00
97249110a4
must still support libgnutls28 for raspbian
2016-03-07 22:18:22 -05:00
98b3b92bbf
Merge branch 'add_onvif_deps' into storageareas
2016-03-07 21:54:25 -05:00
ef9f218c77
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-03-07 21:52:42 -05:00
0e8fc7953d
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-03-07 21:46:10 -05:00
30ffae5bc1
Merge branch 'master' into storageareas
2016-03-07 21:42:06 -05:00
9abcdc76c6
Merge branch 'master' into add_onvif_deps
2016-03-07 21:27:47 -05:00
de85e18829
rpm specfile changes for 1.30.0
2016-03-03 08:33:49 -06:00
3340f9e375
split into multiple lines and add onvif deps
2016-03-03 09:01:26 -05:00
5e617753e5
split into multiple lines and add onvif deps
2016-03-03 09:01:15 -05:00
4f4e65f86c
split into multiple lines and add onvif deps
2016-03-03 09:00:08 -05:00
3c9173fa5c
split into multiple lines and add onvif deps
2016-03-03 08:59:11 -05:00
41db18a8c6
split into multiple lines and add onvif deps
2016-03-03 08:59:03 -05:00
61ffae79d1
split into multiple lines and add onvif deps
2016-03-03 08:58:53 -05:00
d4ed493333
add onvif dependencies and cleanup build-depends
2016-03-02 10:56:07 -05:00
3ce620eb89
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-27 19:46:56 +11:00
0277a66700
Remove eyezm from distros and Cmake.
...
Conflicts:
distros/debian8/control
2016-02-26 22:41:27 +11:00
90dd078c22
bump release
2016-02-22 09:14:57 -05:00
e9be186e6f
changelog
2016-02-19 10:50:43 -05:00
b3f5c10591
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-02-16 08:59:56 -05:00
292e3a141f
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-02-12 13:53:34 -05:00
5da8df45a7
Merge branch 'hide_rtspdescribe' into storageareas
2016-02-12 13:53:09 -05:00
b7256a6891
Merge branch 'master' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
version
2016-02-10 09:17:40 -05:00
a2ae29dfbe
Add php5-gd to depends
2016-02-08 09:47:52 -05:00
5bcc414038
codespell: misc. spelling corrections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
0674fa2d7a
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-02-04 12:21:33 -05:00
89cff287cd
Merge branch 'master' into storageareas
2016-02-04 12:14:16 -05:00
e76d5ad1cb
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-04 07:33:40 +11:00
5a8989b168
Minor RPM packaging changes
2016-02-02 11:47:55 -06:00
48283191ec
Merge branch 'master' into storageareas
2016-02-01 15:47:08 -05:00
f46b10d399
bump release
2016-02-01 15:46:45 -05:00
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
a990b23164
Update zoneminder.f22.spec
2016-01-29 21:25:34 -06:00
fa50327420
Update zoneminder.f23.spec
2016-01-29 21:24:50 -06:00
ebbecd5cc4
add php5-gd to depends. We use it for image scaling
2016-01-14 13:41:09 -05:00
818cd614eb
Merge branch 'multi-server' into storageareas
2016-01-08 10:17:37 -05:00
5ce26ac4df
Change logrotate defaults to daily/rotate 7, which works better with logcheck
2016-01-08 09:59:03 -05:00
3066f66f25
add sphinx-rtd-theme
2016-01-05 13:21:54 -05:00
5c3c8b68a3
Add sphinx rtd theme as a dependency
2016-01-05 09:40:31 -05:00
1918b9b576
bump
2016-01-04 14:44:36 -05:00
b1205bcaa9
Merge branch 'multi-server' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
scripts/zmaudit.pl.in
version
2016-01-02 14:45:24 -05:00
a93f78b7e6
Bump rpm specfiles to 1.29.0
2016-01-02 10:35:52 -06:00
1da87332b7
blah
2016-01-01 21:22:12 -05:00
93dbc3f0c1
Merge multi-server updates and bump version
2016-01-01 16:31:02 -05:00
d5ec34889e
Merge pull request #1211 from SteveGilvarry/multiserver-docs
...
Adding multiserver documentation
2016-01-01 09:01:31 -06:00
f38f216f59
Merge branch 'master' into storageareas
2015-12-29 14:59:44 -05:00
13689d7a7d
Merge branch 'storageareas' into newpointone
...
Conflicts:
web/lang/en_gb.php
web/skins/classic/views/filter.php
2015-12-28 13:13:49 -05:00
63352ac7c9
changelog update
2015-12-28 13:10:27 -05:00
e6e8a75b64
Update zoneminder.f23.spec
2015-12-27 11:48:53 -06:00
33a3661958
cleanup, revent to openprint style objects
2015-12-23 14:03:40 -05:00
769b1f713c
Merge branch 'multi-server' into storageareas
...
Conflicts:
distros/ubuntu1204/apache.conf
2015-12-23 13:13:25 -05:00
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
Isaac Connor
Isaac Connor
Andy Bauer
SteveGilvarry
Jon Burgess
Andrew Bauer
Dmitry Smirnov
Isaac Connor
SteveGilvarry
Heng Liu
Isaac Connor
seebaer1976
Isaac Connor