bff6176797
Merge pull request #856 from ZoneMinder/fix_x10
...
Correct bareword config entries with newer {} style
2015-06-08 10:35:48 -04:00
c391325457
Merge pull request #858 from manupap1/fix_avcodec_warnings
...
Fix detection of deprecated libav / ffmpeg functions
2015-06-08 10:26:35 -04:00
a534e66437
Add version to the startup log line
2015-06-08 10:24:40 -04:00
f3a8217651
resolve conflicts from merge by seebaer1976
2015-06-05 19:34:52 +02:00
e10fdaf344
reduce the wait to 2/10ths instead of a whole second
2015-06-05 11:49:05 -04:00
95d7a3ff94
alter the logic of ReadData. New behaviour is documented. This solves unneccessary disconnects for me.
2015-06-04 11:33:03 -04:00
0308baabb3
This change uses a member Image instead of constantly allocation a new Image.
...
This saves all the initialisation and the lines of debug.
Also in GetImage we potentially remove and entire copy if no scaling or timestamping is being done.
2015-06-03 15:10:52 -04:00
b91d1c7b0c
Don't die if db goes away during logging
2015-06-03 14:57:19 -04:00
c8e41319e6
fix state popup dimensions
2015-06-03 12:22:12 -04:00
f99c5f3627
use correct tag for the frame popup so that it gets the correct popup window size
2015-06-03 12:09:38 -04:00
35074dd75a
Merge pull request #859 from manupap1/fix_iostream_include
...
Move iostream inclusion in zm.h and declare explicitely the namespace
2015-06-01 17:05:57 -04:00
4cf1e61197
Update de_de.php
2015-05-31 17:43:21 +02:00
7811354d92
Move iostream inclusion in zm.h and declare explicitely the namespace for cout
2015-05-29 23:22:20 +02:00
818a5256e4
Readd checking of micro version in zm_mpeg.cpp to fix compilation issue
2015-05-29 19:23:00 +02:00
f6d69e02b5
Mention original source for check functions
2015-05-29 17:45:35 +02:00
a36b4aa65d
Implement version check for ffmpeg and libav (address issue #580 )
2015-05-29 17:38:02 +02:00
f6a226e700
Correct bareword config entries with newer {} style
2015-05-27 10:00:24 -04:00
a64182b45c
Merge pull request #854 from seeebek/german-translation
...
update german translation
2015-05-27 09:55:14 -04:00
bde8f781bd
Merge pull request #850 from seeebek/840-ubuntu-15.04
...
ubuntu 15.04
2015-05-27 09:40:00 -04:00
ba980ae4ae
update german translation
2015-05-27 15:38:47 +02:00
3266b0b57e
change for systemd
2015-05-24 22:13:09 +02:00
3080ecdb20
add service and temp files
2015-05-24 22:09:43 +02:00
a671b452a8
change dependencies for ubuntu 15.04
2015-05-24 22:05:09 +02:00
f45af08947
copy ubutnu1204 without init.d
2015-05-24 22:01:51 +02:00
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
38666466fa
Merge pull request #845 from knnniggett/slang2
...
Additional SLANG changes
2015-05-21 13:37:05 -04:00
bf4038a724
followup changes based on comments in #833
2015-05-21 12:23:31 -05:00
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
5876186909
Merge pull request #803 from knnniggett/mootools
...
Update Mootools
2015-05-21 13:15:13 -04:00
b7890ec923
Merge pull request #833 from knnniggett/slang
...
add translate function
2015-05-21 13:14:44 -04:00
bf7df97abf
Merge pull request #844 from knnniggett/cmake_hostos
...
Cmake hostos
2015-05-21 13:14:15 -04:00
d509861f9e
Merge pull request #838 from ZoneMinder/zmaudit_update1
...
Zmaudit update1: Make MIN_AGE Configurable
2015-05-21 12:10:08 -05:00
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
e8ecc505ed
fix error
2015-05-20 17:23:41 -05:00
47012c58de
Check the Host OS, similar to configure.ac
2015-05-20 17:20:44 -05:00
8d0bdc4cf1
Merge pull request #842 from whorfin/master
...
Port to OmniOS/Solaris
2015-05-19 08:35:22 -05:00
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
d96c952047
Merge branch 'master' into Cmakelists_CleanUp
...
Conflicts:
CMakeLists.txt
2015-05-19 21:12:34 +10:00
334584d37f
exactly rollback web/includes/config.php.in
2015-05-18 22:01:59 -07:00
8c7e633d8f
Undo ZM_VERSION changes
2015-05-18 21:55:00 -07:00
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
fb5c1abc87
Undid ZM_VERSION hacks
2015-05-18 21:44:41 -07:00
f638b077fc
Update README.md
2015-05-18 16:58:11 -05:00
b52b7ea89b
Added OmniOS/Solaris info
2015-05-17 17:34:52 -07:00
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
ea7c1f6883
Update README.md
2015-05-17 16:34:08 -05:00
b65d08b445
Update README.md
...
typo
2015-05-17 16:21:22 -05:00
9bd4fa6c8a
Update README.md
2015-05-17 16:20:37 -05:00
466c6d9dd8
Update README.md
2015-05-17 15:35:49 -05:00
8545f30d72
Update README.md
...
typo
2015-05-17 15:30:07 -05:00
Isaac Connor
Isaac Connor
Sebastian Kaminski
seebaer1976
Emmanuel Papin
Andrew Bauer
Andrew Bauer
SteveGilvarry
Rick Sayre