SteveGilvarry
|
a700cbffdb
|
Merge remote-tracking branch 'upstream/master' into feature-plugins
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/es_es.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/views/monitor.php
|
2015-11-08 21:06:21 +11:00 |
Andrew Bauer
|
800d7dd33a
|
Update apache.conf.in
Keep apache.conf backwards compatible with Apache 2.2
|
2015-08-22 08:56:47 -05:00 |
SteveGilvarry
|
bc47d01971
|
Fix apache logging options to only one of two choices
|
2015-07-28 08:15:18 +10:00 |
Emmanuel Papin
|
6574a128de
|
Do not use 'using namespace' in header files and raise an error if engine versions mismatch
|
2015-06-07 20:40:33 +02:00 |
|
Emmanuel Papin
|
3f20a08d16
|
Add cmake support
|
2015-05-31 02:37:58 +02:00 |
|
Emmanuel Papin
|
872fead1fa
|
Rename zoneminder library
|
2015-05-30 14:11:42 +02:00 |
|
Emmanuel Papin
|
746deece73
|
Rename some files, remove links to unused libraries on binaries and some cleanup
|
2015-05-29 22:26:11 +02:00 |
|
Emmanuel Papin
|
630c8f335f
|
Merge master
|
2015-05-05 23:37:20 +02:00 |
Andrew Bauer
|
7802089b82
|
Use tmpfiles.d to manage tmpdir and sockdir
|
2015-03-31 20:30:27 -05:00 |
|
Emmanuel Papin
|
5060fc490f
|
Merge branch 'master' into plugin_support_test
|
2015-02-15 15:03:23 +01:00 |
clipo1979
|
0c257405b0
|
Update Makefile.am
|
2015-02-08 16:22:19 +00:00 |
|
clipo1979
|
33fef42233
|
Update zoneminder-tmpfiles.conf.in
|
2015-02-08 16:11:07 +00:00 |
|
clipo1979
|
6c86811ff0
|
Update CMakeLists.txt
|
2015-02-08 13:09:01 +00:00 |
|
clipo1979
|
efa760a3fa
|
Create zoneminder-tmpfiles.conf.in
|
2015-02-08 13:07:53 +00:00 |
|
manupap1
|
9bfc64c4f9
|
Install the global plugin configuration file
|
2014-11-11 21:24:20 +01:00 |
|
manupap1
|
03d03bda21
|
Add a global configuration file for plugins
|
2014-11-11 20:59:58 +01:00 |
|
Andrew Bauer
|
966767e346
|
Update zoneminder.service.in
Fix restart issue when using systemd
|
2014-11-06 17:42:40 -06:00 |
|
Andrew Bauer
|
887fe24b98
|
Update zoneminder.service.in
|
2014-09-11 19:20:09 -05:00 |
|
Andrew Bauer
|
1e8e710f5a
|
full systemd support
|
2014-08-10 08:47:11 -05:00 |
Kfir Itzhak
|
9d5ac7ae8c
|
Fix cmake installing wrong files in an out-of-source build
|
2013-11-04 09:56:40 +02:00 |
|
Kfir Itzhak
|
c2bd7c97ec
|
First attempt at enabling out-of-source building for zm with cmake
|
2013-10-31 18:10:00 +02:00 |
|
mastertheknife
|
48f11a8064
|
Add cmake to zoneminder
|
2013-09-28 12:59:50 +03:00 |
Isaac Connor
|
0a9e63ca2c
|
remove autogenerated files
|
2013-09-06 14:40:55 -04:00 |
Kyle Johnson
|
c8ad6ae656
|
Fixes #107 for real this time.
|
2013-09-05 20:31:52 -04:00 |
Isaac Connor
|
3a8481a591
|
cleanup
|
2013-05-10 14:02:22 -04:00 |
nextime
|
33cbd89212
|
Migrate svn to git
|
2013-03-17 00:45:21 +01:00 |