Pliable Pixels
|
b41538fe65
|
Added definition for Foscam FI8918W
|
2015-06-19 15:51:07 -04:00 |
|
Pliable Pixels
|
67f1914e26
|
Added definition for Foscam FI8918W
|
2015-06-19 15:48:03 -04:00 |
|
Pliable Pixels
|
f8cc27e224
|
Protocol for 8918W
|
2015-06-19 15:45:50 -04:00 |
|
Pliable Pixels
|
991291ce67
|
declared so perl does not complain of globals
|
2015-06-19 14:12:08 -04:00 |
|
Pliable Pixels
|
be4a434dbd
|
Added 9831W to update script
|
2015-06-19 13:57:19 -04:00 |
|
Pliable Pixels
|
35e8a9d89b
|
Added 9831W to PTZ protocol DB
|
2015-06-19 13:06:00 -04:00 |
|
Pliable Pixels
|
39ee845ff0
|
Updated 9831W foscam script
|
2015-06-19 12:58:40 -04:00 |
Pliable Pixels
|
3ef916f49c
|
Update api.rst
|
2015-06-14 10:51:28 -04:00 |
Isaac Connor
|
03de98980f
|
cleanup log
|
2015-06-12 11:53:08 -04:00 |
|
Isaac Connor
|
18674b7973
|
cleanup
|
2015-06-12 11:51:43 -04:00 |
|
Isaac Connor
|
7759e57776
|
update changelog to match last snapshot
|
2015-06-12 11:50:10 -04:00 |
|
Isaac Connor
|
106d543367
|
add ubuntu15.04 using cmake with split packages
|
2015-06-12 11:20:24 -04:00 |
|
Isaac Connor
|
bda35ed4d6
|
fix bootstrap.ini substitution
|
2015-06-12 11:12:58 -04:00 |
Isaac Connor
|
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 |
|
Pliable Pixels
|
9b3ae210e5
|
Merge pull request #1 from knnniggett/881-merge-angularui-apis
Convert Crud to submodule
|
2015-06-11 13:06:00 -04:00 |
Andrew Bauer
|
d915d859ed
|
Convert Crud to submodule
|
2015-06-11 11:56:39 -05:00 |
Andrew Bauer
|
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 |
|
Andrew Bauer
|
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 |
|
Andrew Bauer
|
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 |
Ubuntu
|
dd9603f70f
|
Merged Angular UI branch API to master
|
2015-06-11 02:58:58 +00:00 |
|
Isaac Connor
|
bff6176797
|
Merge pull request #856 from ZoneMinder/fix_x10
Correct bareword config entries with newer {} style
|
2015-06-08 10:35:48 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
a534e66437
|
Add version to the startup log line
|
2015-06-08 10:24:40 -04:00 |
|
Isaac Connor
|
e10fdaf344
|
reduce the wait to 2/10ths instead of a whole second
|
2015-06-05 11:49:05 -04:00 |
|
Isaac Connor
|
b91d1c7b0c
|
Don't die if db goes away during logging
|
2015-06-03 14:57:19 -04:00 |
|
Isaac Connor
|
c8e41319e6
|
fix state popup dimensions
|
2015-06-03 12:22:12 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
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
|
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 |