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

4982 Commits

Author SHA1 Message Date
Linwood-F 72a92ee9d5 Add exif to jpg images saved 2015-07-23 19:34:39 -04:00
Emmanuel Papin 9e16c8a066 Improve log message and logic in UpdateAdaptiveSkip() 2015-07-24 01:01:51 +02:00
Emmanuel Papin 0c7b8e1acb Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into add_analysis_interval 2015-07-24 00:35:08 +02:00
Emmanuel Papin 1c8363cc29 Do not display 0.00 for AnalysisFPS 2015-07-24 00:27:47 +02:00
Emmanuel Papin 3b2378c21d Add a new warning in GetAnalysisRate function 2015-07-24 00:26:53 +02:00
Emmanuel Papin 2ccb378e2d Fix a typo error in sql file 2015-07-24 00:25:57 +02:00
Emmanuel Papin 74bd2d9ab9 Merge branch 'add_analysis_fps' of https://github.com/manupap1/ZoneMinder into add_analysis_fps 
Fixed conflicts in:
	src/zm_monitor.cpp
 2015-07-23 16:41:45 -04:00
Emmanuel Papin 649a39b372 Replace analysis interval parameter by analysis framerate 2015-07-23 16:36:30 -04:00
Isaac Connor b90d8c4f73 db_get fails if there is no debconf entry (for example if the package is not yet configured) 2015-07-23 15:08:06 -04:00
Isaac Connor 27ef821a4f db_get fails if there is no debconf entry (for example if the 
package is not yet configured)
 2015-07-23 15:07:32 -04:00
Emmanuel Papin afd3c7f93f Update comments in src/zm_monitor.cpp 2015-07-22 22:27:20 +02:00
Emmanuel Papin d2a3655d51 Fix a typo error in db/zm_create.sql.in 2015-07-22 22:15:34 +02:00
Emmanuel Papin d0d72672a7 Fix sql files 2015-07-22 21:49:06 +02:00
Emmanuel Papin 132e0a1798 Add analysis fps paramter to monitors 2015-07-22 21:38:35 +02:00
Emmanuel Papin a6b7c6e99f Add analysis interval parameter to monitors 2015-07-21 22:52:52 +02:00
Andrew Bauer a6a33fa77f Merge pull request #955 from pliablepixels/953-configs-API-fix 
Fixed Configs API to return all values
 2015-07-21 12:42:41 -05:00
Pliable Pixels e332fc36a9 Fixed Configs API to return all values 2015-07-21 13:28:37 -04:00
Andrew Bauer 500b560884 Merge pull request #952 from schrorg/583-correct-de_de-encoding 
Change encoding of german language file to UTF-8
 2015-07-20 08:07:30 -05:00
Isaac Connor 02ee745167 parameter to defined should be in quotes 2015-07-17 10:09:22 -04:00
Andrew Bauer 712d3959d2 Merge pull request #951 from schrorg/950-correct-ffmpeg-source 
Show correct part of URL (hostname) for ffmpeg sources in console
 2015-07-17 08:37:17 -05:00
root a9df82256b Change encoding of web/lang/de_de.php from ISO-8859-1 to UTF-8 2015-07-17 14:24:46 +02:00
root 560a4cccbe Show correct part of URL (hostname) for ffmpeg sources in console 2015-07-17 13:59:40 +02:00
Andrew Bauer 10adae3696 Merge pull request #941 from ZoneMinder/trigger_on_space 
add space instead of + to handle old Axis cameras
 2015-07-16 13:09:36 -05:00
Andrew Bauer e1a30cf4e5 Merge pull request #942 from ZoneMinder/add_db_functions 
add some utility db functions
 2015-07-16 13:08:49 -05:00
Andrew Bauer fffea54ed1 Merge pull request #944 from ZoneMinder/php-gd 
add php-gd to list of dependencies for debian and ubuntu builds
 2015-07-16 13:08:33 -05:00
Isaac Connor 424b7d50bd php-gd should isntead be php5-gd 2015-07-16 13:59:06 -04:00
Isaac Connor ef19d5df8a Merge pull request #943 from knnniggett/php-gd 
rpm packaging - require php-gd
 2015-07-16 13:40:38 -04:00
Isaac Connor e3042c59a5 add php-gd to list of dependencies for debian and ubuntu builds 2015-07-16 13:40:16 -04:00
Andrew Bauer eb5bb641d6 rpm packaging - require php-gd 2015-07-16 12:15:24 -05:00
Isaac Connor ad23969982 add space instead of + to handle old Axis cameras 2015-07-16 13:06:15 -04:00
Isaac Connor 48fa0c3d42 add some utility db functions 2015-07-16 13:04:28 -04:00
Andrew Bauer a53ee60590 Merge pull request #938 from onlyjob/zmtrigger 
zmtrigger: POD documentation
 2015-07-16 06:47:59 -05:00
Dmitry Smirnov c788d70b93 zmtrigger: POD documentation 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-07-16 18:35:42 +10:00
Andrew Bauer 4e5ca2cead Merge pull request #937 from ZoneMinder/better_logging 
improve log
 2015-07-15 15:21:08 -05:00
Andrew Bauer 104f375669 Merge pull request #936 from ZoneMinder/handle_serial_trigger_problem 
add error handling on failure to open serial port
 2015-07-15 15:20:56 -05:00
Isaac Connor 01518d6aa9 fix. without this zmc won't restart automatically 2015-07-15 16:08:02 -04:00
Isaac Connor e4b3344a8c improve log 2015-07-15 16:06:55 -04:00
Isaac Connor cf3f160783 add error handling on failure to open serial port 2015-07-15 16:02:02 -04:00
Isaac Connor 4630bad24b add http to control url if it isn't present 2015-07-15 15:59:21 -04:00
Isaac Connor 09efee3be3 limit man install to 8 to not conflict with man pages in libzoneminder-perl 2015-07-15 15:46:53 -04:00
Isaac Connor 2f3779473b release SNAPSHOT2015071501 2015-07-15 15:45:02 -04:00
Isaac Connor 4f0466739f remove generated .debhelpers 2015-07-15 12:04:00 -04:00
Isaac Connor 7a08127d21 release snapshot 2015071501 2015-07-15 12:02:20 -04:00
Andrew Bauer a9035221cb Merge pull request #934 from ZoneMinder/fix_utf 
fix utf8 ' characters
 2015-07-15 10:30:28 -05:00
Andrew Bauer bf9f183552 Merge pull request #933 from ZoneMinder/issue_932 
roudn up when calculating buffer size for scaled image. Fixes #932
 2015-07-15 09:45:10 -05:00
Isaac Connor 33a9fc6175 fix utf8 ' characters 2015-07-15 10:37:08 -04:00
Isaac Connor 602f703df8 roudn up when calculating buffer size for scaled image. Fixes #932 2015-07-15 10:22:57 -04:00
Andrew Bauer 619464f43a Merge pull request #918 from ZoneMinder/multi-server 
Add ServerId to Monitors
 2015-07-14 16:07:19 -05:00
Isaac Connor 47be582354 bump version to 1.28.100 2015-07-14 16:11:27 -04:00
Isaac Connor ace8597b8d Merge branch 'master' into multi-server 2015-07-14 16:10:51 -04:00