60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
82b32578ec
Merge branch 'master' into iconnor_video
2016-04-01 12:54:09 -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
688dd67697
Merge branch 'add_onvif_deps' into storageareas
2016-03-09 11:18:35 -05:00
740dc12f7c
remove extra comma
2016-03-09 11:17:50 -05:00
9647a680f6
Merge branch 'add_onvif_deps' into storageareas
2016-03-08 16:06:30 -05:00
b0835660b1
add libsys-cpu-perl and libsys-meminfo-perl
2016-03-08 15:56:08 -05:00
98b3b92bbf
Merge branch 'add_onvif_deps' into storageareas
2016-03-07 21:54:25 -05:00
d4ed493333
add onvif dependencies and cleanup build-depends
2016-03-02 10:56:07 -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
5bcc414038
codespell: misc. spelling corrections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11: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
769b1f713c
Merge branch 'multi-server' into storageareas
...
Conflicts:
distros/ubuntu1204/apache.conf
2015-12-23 13:13:25 -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
f4debc203d
Only run zmupdate.pl if the mysql db is located here
2015-12-20 12:23:40 -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
7514f43ef4
only update db if db is local
2015-11-27 13:54:31 -05:00
37b041b561
add index to recommended default permissions on zmuser
2015-11-20 16:00:57 -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
a45a52601d
change format to native, which makes building packages so much easier
2015-10-30 12:19:12 -04:00
c9d7087c91
Setting the TZ ENV variable prevents every gettimeofday call from reading /etc/timezone
2015-10-01 11:47:12 -04:00
e88d63cb35
need to check the case of having a / at the end
2015-09-14 14:55:37 -04:00
3f3c637227
don't need apache patch anymore
2015-09-14 14:36:19 -04:00
6e47812669
This patch is no longer needed
2015-09-14 14:14:13 -04:00
492cafe08e
set AllowOverride All for api dir
2015-08-19 16:08:48 -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
Isaac Connor
Isaac Connor
Dmitry Smirnov
Isaac Connor