Isaac Connor
|
740dc12f7c
|
remove extra comma
|
2016-03-09 11:17:50 -05:00 |
SteveGilvarry
|
24ebc33ea4
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-03-09 20:54:11 +11:00 |
|
Isaac Connor
|
9647a680f6
|
Merge branch 'add_onvif_deps' into storageareas
|
2016-03-08 16:06:30 -05:00 |
|
Isaac Connor
|
094b041c43
|
There must be spaces before the comma
|
2016-03-08 16:06:16 -05:00 |
|
Isaac Connor
|
f8582ad9b6
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:56:26 -05:00 |
|
Isaac Connor
|
c27387610c
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:56:17 -05:00 |
|
Isaac Connor
|
b0835660b1
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:56:08 -05:00 |
|
Isaac Connor
|
12a277912e
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:56:01 -05:00 |
|
Isaac Connor
|
cf1d475dbb
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:55:56 -05:00 |
|
Isaac Connor
|
b9996b4fc0
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:55:37 -05:00 |
|
Isaac Connor
|
cfbf2cced1
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:55:29 -05:00 |
|
Isaac Connor
|
455c268a0c
|
add libsys-cpu-perl and libsys-meminfo-perl
|
2016-03-08 15:55:11 -05:00 |
|
Isaac Connor
|
172b687ab3
|
Merge branch 'add_onvif_deps' into storageareas
|
2016-03-07 22:18:39 -05:00 |
|
Isaac Connor
|
97249110a4
|
must still support libgnutls28 for raspbian
|
2016-03-07 22:18:22 -05:00 |
|
Isaac Connor
|
98b3b92bbf
|
Merge branch 'add_onvif_deps' into storageareas
|
2016-03-07 21:54:25 -05:00 |
Isaac Connor
|
ef9f218c77
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-03-07 21:52:42 -05:00 |
|
Isaac Connor
|
0e8fc7953d
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-03-07 21:46:10 -05:00 |
|
Isaac Connor
|
30ffae5bc1
|
Merge branch 'master' into storageareas
|
2016-03-07 21:42:06 -05:00 |
|
Isaac Connor
|
9abcdc76c6
|
Merge branch 'master' into add_onvif_deps
|
2016-03-07 21:27:47 -05:00 |
Andrew Bauer
|
de85e18829
|
rpm specfile changes for 1.30.0
|
2016-03-03 08:33:49 -06:00 |
|
Isaac Connor
|
3340f9e375
|
split into multiple lines and add onvif deps
|
2016-03-03 09:01:26 -05:00 |
|
Isaac Connor
|
5e617753e5
|
split into multiple lines and add onvif deps
|
2016-03-03 09:01:15 -05:00 |
|
Isaac Connor
|
4f4e65f86c
|
split into multiple lines and add onvif deps
|
2016-03-03 09:00:08 -05:00 |
|
Isaac Connor
|
3c9173fa5c
|
split into multiple lines and add onvif deps
|
2016-03-03 08:59:11 -05:00 |
|
Isaac Connor
|
41db18a8c6
|
split into multiple lines and add onvif deps
|
2016-03-03 08:59:03 -05:00 |
|
Isaac Connor
|
61ffae79d1
|
split into multiple lines and add onvif deps
|
2016-03-03 08:58:53 -05:00 |
|
Isaac Connor
|
d4ed493333
|
add onvif dependencies and cleanup build-depends
|
2016-03-02 10:56:07 -05:00 |
|
SteveGilvarry
|
3ce620eb89
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-02-27 19:46:56 +11:00 |
|
SteveGilvarry
|
0277a66700
|
Remove eyezm from distros and Cmake.
Conflicts:
distros/debian8/control
|
2016-02-26 22:41:27 +11:00 |
|
Isaac Connor
|
90dd078c22
|
bump release
|
2016-02-22 09:14:57 -05:00 |
|
Isaac Connor
|
e9be186e6f
|
changelog
|
2016-02-19 10:50:43 -05:00 |
|
Isaac Connor
|
b3f5c10591
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-02-16 08:59:56 -05:00 |
|
Isaac Connor
|
292e3a141f
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-02-12 13:53:34 -05:00 |
|
Isaac Connor
|
5da8df45a7
|
Merge branch 'hide_rtspdescribe' into storageareas
|
2016-02-12 13:53:09 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
a2ae29dfbe
|
Add php5-gd to depends
|
2016-02-08 09:47:52 -05:00 |
Dmitry Smirnov
|
5bcc414038
|
codespell: misc. spelling corrections
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
|
2016-02-08 20:41:36 +11:00 |
|
Isaac Connor
|
0674fa2d7a
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-02-04 12:21:33 -05:00 |
|
Isaac Connor
|
89cff287cd
|
Merge branch 'master' into storageareas
|
2016-02-04 12:14:16 -05:00 |
|
SteveGilvarry
|
e76d5ad1cb
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-02-04 07:33:40 +11:00 |
Andy Bauer
|
5a8989b168
|
Minor RPM packaging changes
|
2016-02-02 11:47:55 -06:00 |
|
Isaac Connor
|
48283191ec
|
Merge branch 'master' into storageareas
|
2016-02-01 15:47:08 -05:00 |
|
Isaac Connor
|
f46b10d399
|
bump release
|
2016-02-01 15:46:45 -05: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
|
a990b23164
|
Update zoneminder.f22.spec
|
2016-01-29 21:25:34 -06:00 |
|
Andrew Bauer
|
fa50327420
|
Update zoneminder.f23.spec
|
2016-01-29 21:24:50 -06:00 |
Isaac Connor
|
ebbecd5cc4
|
add php5-gd to depends. We use it for image scaling
|
2016-01-14 13:41:09 -05:00 |
|
Isaac Connor
|
818cd614eb
|
Merge branch 'multi-server' into storageareas
|
2016-01-08 10:17:37 -05:00 |
|
Isaac Connor
|
5ce26ac4df
|
Change logrotate defaults to daily/rotate 7, which works better with logcheck
|
2016-01-08 09:59:03 -05:00 |
|
Isaac Connor
|
3066f66f25
|
add sphinx-rtd-theme
|
2016-01-05 13:21:54 -05:00 |
|
Isaac Connor
|
5c3c8b68a3
|
Add sphinx rtd theme as a dependency
|
2016-01-05 09:40:31 -05:00 |
|
Isaac Connor
|
1918b9b576
|
bump
|
2016-01-04 14:44:36 -05:00 |
|
Isaac Connor
|
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 |
|
Andy Bauer
|
a93f78b7e6
|
Bump rpm specfiles to 1.29.0
|
2016-01-02 10:35:52 -06:00 |
|
Isaac Connor
|
1da87332b7
|
blah
|
2016-01-01 21:22:12 -05:00 |
|
Isaac Connor
|
93dbc3f0c1
|
Merge multi-server updates and bump version
|
2016-01-01 16:31:02 -05:00 |
|
Andrew Bauer
|
d5ec34889e
|
Merge pull request #1211 from SteveGilvarry/multiserver-docs
Adding multiserver documentation
|
2016-01-01 09:01:31 -06:00 |
|
Isaac Connor
|
f38f216f59
|
Merge branch 'master' into storageareas
|
2015-12-29 14:59:44 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
63352ac7c9
|
changelog update
|
2015-12-28 13:10:27 -05:00 |
|
Andrew Bauer
|
e6e8a75b64
|
Update zoneminder.f23.spec
|
2015-12-27 11:48:53 -06:00 |
|
Isaac Connor
|
33a3661958
|
cleanup, revent to openprint style objects
|
2015-12-23 14:03:40 -05:00 |
|
Isaac Connor
|
769b1f713c
|
Merge branch 'multi-server' into storageareas
Conflicts:
distros/ubuntu1204/apache.conf
|
2015-12-23 13:13:25 -05:00 |
SteveGilvarry
|
1ff2043774
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2015-12-23 19:24:08 +11:00 |
|
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
|
b33c0764fe
|
update to new cgi-bin path
|
2015-12-21 12:59:52 -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 |
|
SteveGilvarry
|
220ee5e516
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2015-11-29 13:17:22 +11: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 |
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
|
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 |