seebaer1976
4cf1e61197
Update de_de.php
2015-05-31 17:43:21 +02:00
Emmanuel Papin
7811354d92
Move iostream inclusion in zm.h and declare explicitely the namespace for cout
2015-05-29 23:22:20 +02:00
Emmanuel Papin
818a5256e4
Readd checking of micro version in zm_mpeg.cpp to fix compilation issue
2015-05-29 19:23:00 +02:00
Emmanuel Papin
f6d69e02b5
Mention original source for check functions
2015-05-29 17:45:35 +02:00
Emmanuel Papin
a36b4aa65d
Implement version check for ffmpeg and libav (address issue #580 )
2015-05-29 17:38:02 +02:00
Isaac Connor
f6a226e700
Correct bareword config entries with newer {} style
2015-05-27 10:00:24 -04:00
Isaac Connor
a64182b45c
Merge pull request #854 from seeebek/german-translation
...
update german translation
2015-05-27 09:55:14 -04:00
Isaac Connor
bde8f781bd
Merge pull request #850 from seeebek/840-ubuntu-15.04
...
ubuntu 15.04
2015-05-27 09:40:00 -04:00
Sebastian Kaminski
ba980ae4ae
update german translation
2015-05-27 15:38:47 +02:00
Sebastian Kaminski
3266b0b57e
change for systemd
2015-05-24 22:13:09 +02:00
Sebastian Kaminski
3080ecdb20
add service and temp files
2015-05-24 22:09:43 +02:00
Sebastian Kaminski
a671b452a8
change dependencies for ubuntu 15.04
2015-05-24 22:05:09 +02:00
Sebastian Kaminski
f45af08947
copy ubutnu1204 without init.d
2015-05-24 22:01:51 +02:00
Isaac Connor
47192156cd
alter shutdown behaviour to send a term signal to all processes and then go through again to send a KILL if neccessary. This eliminates unneccesary sleeping.
2015-05-21 15:37:08 -04:00
Isaac Connor
38666466fa
Merge pull request #845 from knnniggett/slang2
...
Additional SLANG changes
2015-05-21 13:37:05 -04:00
Andrew Bauer
bf4038a724
followup changes based on comments in #833
2015-05-21 12:23:31 -05:00
Isaac Connor
45b5fd3945
Merge pull request #801 from knnniggett/nph-zms
...
link zms to nph-zms, rather than build identical
2015-05-21 13:15:38 -04:00
Isaac Connor
5876186909
Merge pull request #803 from knnniggett/mootools
...
Update Mootools
2015-05-21 13:15:13 -04:00
Isaac Connor
b7890ec923
Merge pull request #833 from knnniggett/slang
...
add translate function
2015-05-21 13:14:44 -04:00
Isaac Connor
bf7df97abf
Merge pull request #844 from knnniggett/cmake_hostos
...
Cmake hostos
2015-05-21 13:14:15 -04:00
Andrew Bauer
d509861f9e
Merge pull request #838 from ZoneMinder/zmaudit_update1
...
Zmaudit update1: Make MIN_AGE Configurable
2015-05-21 12:10:08 -05:00
Andrew Bauer
4013d2134f
Delete README-OmniOS.txt
...
This information is going to change and will be re-added later.
2015-05-20 17:26:43 -05:00
Andrew Bauer
e8ecc505ed
fix error
2015-05-20 17:23:41 -05:00
Andrew Bauer
47012c58de
Check the Host OS, similar to configure.ac
2015-05-20 17:20:44 -05:00
Andrew Bauer
8d0bdc4cf1
Merge pull request #842 from whorfin/master
...
Port to OmniOS/Solaris
2015-05-19 08:35:22 -05:00
Andrew Bauer
2549865c63
Merge pull request #812 from SteveGilvarry/Cmakelists_CleanUp
...
Fixes #760 in part Clean up CMakeLists.txt
2015-05-19 08:09:08 -05:00
SteveGilvarry
d96c952047
Merge branch 'master' into Cmakelists_CleanUp
...
Conflicts:
CMakeLists.txt
2015-05-19 21:12:34 +10:00
Rick Sayre
334584d37f
exactly rollback web/includes/config.php.in
2015-05-18 22:01:59 -07:00
Rick Sayre
8c7e633d8f
Undo ZM_VERSION changes
2015-05-18 21:55:00 -07:00
Rick Sayre
ffe46978d2
Undid PATH change, needed for mysqldump; which I see is indeed called
...
many other places with incorrect paths.
Make macros should be setting all this up correctly!
mysqldump is [for example] in /opt/local/bin, not /usr/bin, with pkgin
2015-05-18 21:49:08 -07:00
Rick Sayre
fb5c1abc87
Undid ZM_VERSION hacks
2015-05-18 21:44:41 -07:00
Andrew Bauer
f638b077fc
Update README.md
2015-05-18 16:58:11 -05:00
Rick Sayre
b52b7ea89b
Added OmniOS/Solaris info
2015-05-17 17:34:52 -07:00
Rick Sayre
12516da3dc
Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
...
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
Andrew Bauer
ea7c1f6883
Update README.md
2015-05-17 16:34:08 -05:00
Andrew Bauer
b65d08b445
Update README.md
...
typo
2015-05-17 16:21:22 -05:00
Andrew Bauer
9bd4fa6c8a
Update README.md
2015-05-17 16:20:37 -05:00
Andrew Bauer
466c6d9dd8
Update README.md
2015-05-17 15:35:49 -05:00
Andrew Bauer
8545f30d72
Update README.md
...
typo
2015-05-17 15:30:07 -05:00
Andrew Bauer
9d4916ad49
Update README.md
2015-05-17 15:27:46 -05:00
Andrew Bauer
3c5e05d1f4
Update README.md
2015-05-17 15:24:35 -05:00
Andrew Bauer
04f698824f
Update README.md
2015-05-17 15:23:14 -05:00
Andrew Bauer
134b6b1dbb
Update README.md
2015-05-17 15:22:02 -05:00
Andrew Bauer
d8cd6abc06
Update README.md
...
One of may commits to update build instructions for Redhat based distros
2015-05-17 15:00:39 -05:00
Andrew Bauer
a03f3f39b5
Update README.md
...
Better http link formatting
2015-05-14 10:06:16 -05:00
Andrew Bauer
a1ca1a8af5
Update README.md
2015-05-14 10:02:35 -05:00
Isaac Connor
8eb5e53aad
Remove with {ZM_PATH_SWAP}
2015-05-14 10:27:11 -04:00
Andrew Bauer
691fbbb0a6
Update README.md
2015-05-14 09:06:42 -05:00
Isaac Connor
3709ac411d
Not having ZM_AUDIT_MIN_AGE should be fatal
2015-05-13 12:36:35 -04:00
Isaac Connor
950cd06535
Revert "Revert "Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting""
...
This reverts commit 9c73b7247c
.
2015-05-13 11:38:55 -04:00