5dd1c6cf38
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-06-18 13:09:56 -04:00
99384983a5
merge from recent ubuntu1504 switch to ffmpeg version of av libs
2015-06-18 13:09:42 -04:00
dcb7b1d259
Merge pull request #883 from pliablepixels/881-bootstrap-loading-config
...
881 bootstrap loading config
2015-06-14 14:43:01 -04:00
5b9a74ce1f
Merge pull request #884 from SteveGilvarry/MergeDebianPatches
...
Use avconv as alternative to ffmpeg executable
2015-06-14 14:42:10 -04:00
21b6bc76c9
Merge pull request #886 from pliablepixels/pliablepixels-api-documentation
...
Updated API document
2015-06-14 14:41:55 -04:00
71665a3315
Added updated API information
...
Reflected new APIs, corrected and updated examples
2015-06-14 11:21:00 -04:00
3ef916f49c
Update api.rst
2015-06-14 10:51:28 -04:00
22ec67dd3f
Find avconv as alternative to ffmpeg
2015-06-14 16:51:31 +10:00
7112001b64
getVersion.json now returns both ZM version and API version
2015-06-13 16:33:15 +00:00
12ba217de0
Added API version in addition to ZM version, also added loadConfig code that was there in the angular-ui branch but not merged to master
2015-06-13 16:32:37 +00:00
11bd2139f4
Added API version in addition to ZM version
2015-06-13 16:30:28 +00:00
03de98980f
cleanup log
2015-06-12 11:53:08 -04:00
18674b7973
cleanup
2015-06-12 11:51:43 -04:00
7759e57776
update changelog to match last snapshot
2015-06-12 11:50:10 -04:00
106d543367
add ubuntu15.04 using cmake with split packages
2015-06-12 11:20:24 -04:00
bda35ed4d6
fix bootstrap.ini substitution
2015-06-12 11:12:58 -04:00
ecb7720056
Merge pull request #882 from pliablepixels/881-merge-angularui-apis
...
Merged Angular UI branch API to master
2015-06-12 11:06:59 -04:00
9b3ae210e5
Merge pull request #1 from knnniggett/881-merge-angularui-apis
...
Convert Crud to submodule
2015-06-11 13:06:00 -04:00
d915d859ed
Convert Crud to submodule
2015-06-11 11:56:39 -05:00
846bea2aa6
Merge pull request #866 from ZoneMinder/no_death_on_db_disconnect_in_logger
...
Don't die if db goes away during logging
2015-06-11 15:17:50 +02:00
dc845e93e3
Merge pull request #873 from ZoneMinder/shorter_stream_timeout
...
reduce the wait to 2/10ths instead of a whole second
2015-06-11 15:13:31 +02:00
249b9e2952
Merge pull request #875 from ZoneMinder/add_version_to_startup_log
...
Add version to the startup log line
2015-06-11 15:12:00 +02:00
dd9603f70f
Merged Angular UI branch API to master
2015-06-11 02:58:58 +00:00
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
Isaac Connor
Isaac Connor
Pliable Pixels
SteveGilvarry
pliablepixels
Andrew Bauer
Andrew Bauer
Ubuntu
Sebastian Kaminski
seebaer1976
Emmanuel Papin