ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,606 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

4606 Commits

Author SHA1 Message Date
Andrew Bauer 13b9921680 Modify zmsystemctl pod documentation 2015-06-20 16:13:40 -05:00
Andrew Bauer fd239f6545 Generate man pages for perl scripts in the bin folder 2015-06-20 15:22:11 -05:00
Andrew Bauer 1acc1f4fd8 Merge pull request #895 from pliablepixels/893-foscam-9831W-and-other-foscams 
893 foscam 9831 w and other foscams
 2015-06-19 22:18:21 +02:00
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
Andrew Bauer 07bd7de82f Merge pull request #894 from pliablepixels/893-foscam-9831W-and-other-foscams 
893 foscam 9831 w and other foscams
 2015-06-19 20:11:03 +02: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
Andrew Bauer 8d309fbd6e Merge pull request #874 from seeebek/master 
German translation update
 2015-06-19 13:50:55 +02:00
Isaac Connor 5dd1c6cf38 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-06-18 13:09:56 -04:00
Isaac Connor 99384983a5 merge from recent ubuntu1504 switch to ffmpeg version of av libs 2015-06-18 13:09:42 -04:00
Isaac Connor dcb7b1d259 Merge pull request #883 from pliablepixels/881-bootstrap-loading-config 
881 bootstrap loading config
 2015-06-14 14:43:01 -04:00
Isaac Connor 5b9a74ce1f Merge pull request #884 from SteveGilvarry/MergeDebianPatches 
Use avconv as alternative to ffmpeg executable
 2015-06-14 14:42:10 -04:00
Isaac Connor 21b6bc76c9 Merge pull request #886 from pliablepixels/pliablepixels-api-documentation 
Updated API document
 2015-06-14 14:41:55 -04:00
Pliable Pixels 71665a3315 Added updated API information 
Reflected new APIs, corrected and updated examples
 2015-06-14 11:21:00 -04:00
Pliable Pixels 3ef916f49c Update api.rst 2015-06-14 10:51:28 -04:00
SteveGilvarry 22ec67dd3f Find avconv as alternative to ffmpeg 2015-06-14 16:51:31 +10:00
pliablepixels 7112001b64 getVersion.json now returns both ZM version and API version 2015-06-13 16:33:15 +00:00
pliablepixels 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
pliablepixels 11bd2139f4 Added API version in addition to ZM version 2015-06-13 16:30:28 +00: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
Sebastian Kaminski f3a8217651 resolve conflicts from merge by seebaer1976 2015-06-05 19:34:52 +02: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
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