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
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