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

4987 Commits

Author SHA1 Message Date
Andrew Bauer 95ca7d8256 Merge pull request #996 from pliablepixels/995-Events-count-per-API 
995 events count per api (bumps up # of events reported per API call)
 2015-08-07 15:42:50 -05:00
Pliable Pixels 2b0a975fef Bumped up # of events per API to 100 instead of 25 2015-08-07 16:25:48 -04:00
Pliable Pixels 38799050ef APIs will be served only if user is logged into the ZM portal 2015-08-07 16:14:02 -04:00
Robin Daermann 5a0d0ca5a3 Made large font selectable by a constant 2015-08-06 17:42:52 +02:00
Robin Daermann c733fec476 First (working) steps for adding large timestamp to images 2015-08-06 14:43:10 +02:00
Isaac Connor 485cf88120 Merge pull request #990 from schrorg/dark-css 
Implemented #989 (highlight current row in tables) for dark CSS
 2015-08-05 09:50:36 -04:00
Robin Daermann 37e01b504b Implemented #989 (highlight current row in tables) for dark CSS 2015-08-05 14:36:07 +02:00
Isaac Connor 2e1a145eb0 Merge pull request #989 from onlyjob/CSS 
CSS[skins/classic]: highlight current row in tables.
 2015-08-04 21:15:09 -04:00
Dmitry Smirnov c4f78d634c CSS[skins/classic]: highlight current row in tables. 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-08-05 10:43:02 +10:00
Isaac Connor 4c8d7d7f62 quiet error when no Servers in Servers table 2015-08-04 11:48:04 -04:00
Isaac Connor e178e1b1d6 fix #948 1 2015-08-04 11:37:11 -04:00
Isaac Connor d9ee08a27b Merge pull request #983 from Linwood-F/982-demote-terminating-logger-msg-to-debug 
Change from info to debug
 2015-08-04 10:12:08 -04:00
Isaac Connor a36bee3767 Merge pull request #984 from Linwood-F/507-shared-data-for-purpose-query-warning 
Remove shared data warning for purpose query only
 2015-08-04 10:09:59 -04:00
Linwood-F 546b0dd353 Remove shared data warning for purpose query only 2015-08-03 20:37:17 -04:00
Linwood-F 2538514d18 Change from info to debug 2015-08-03 18:39:14 -04:00
Andrew Bauer 09d2162f1b Merge pull request #980 from ZoneMinder/fix_image_dimensions_check 
Fix image dimensions check
 2015-07-31 09:40:18 -05:00
Isaac Connor abd4ee6ca8 Merge branch 'master' into fix_image_dimensions_check 2015-07-31 10:30:31 -04:00
Isaac Connor 46b9bd5d1c change the captured image size to camera image size check to be a > instead of !=. As long as we have enough buffer space, it doesn't matter if the captured image is smaller than what we defined. 2015-07-31 10:29:53 -04:00
Andrew Bauer 2dcc118deb Merge pull request #967 from schrorg/dark-css 
Dark CSS for classic theme
 2015-07-30 07:18:42 -05:00
Emmanuel Papin f7cfa1ecd4 Fix analysis sample rate calculation 2015-07-28 23:07:02 +02:00
SteveGilvarry bc47d01971 Fix apache logging options to only one of two choices 2015-07-28 08:15:18 +10:00
Emmanuel Papin 93990b253f Use a dedicated pre event buffer if analysis_fps is set 2015-07-27 16:24:32 +02:00
Robin Daermann 651cffd3b5 Small color corrections in tabList 2015-07-27 10:07:01 +02:00
Robin Daermann 14ebd937c7 Added missing javascript file to Makefile.am 2015-07-27 09:53:59 +02:00
Robin Daermann 57843cc0c8 Added new Makefiles to configure.ac for dark CSS 2015-07-27 09:53:59 +02:00
Robin Daermann 5588406570 Add dark CSS for classic view 2015-07-27 09:53:59 +02:00
root 911f0fad28 Use destination color from CSS in transition effect in log view (instead 
of #000000)
 2015-07-27 09:53:59 +02:00
SteveGilvarry 7466553026 Sample auto generated changelog 2015-07-26 16:51:47 +10:00
Emmanuel Papin 18758826c7 Do not call time() function when it is not necessary 2015-07-25 13:46:11 +02:00
Emmanuel Papin 0bff99f5c7 Improve string conversion and use unsigned type for analysis_update_delay 2015-07-25 13:38:50 +02:00
Andrew Bauer a206d46248 Update README.md 2015-07-24 14:01:25 -05:00
Isaac Connor a64bbd0b56 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-07-24 13:42:07 -04:00
Isaac Connor 3e5f6c65d3 Fix to scale, moving the +1's into the buffer allocation instead of calculation of new_width and new_height 2015-07-24 13:30:58 -04:00
Linwood-F 965425c395 Remove extraneous file 2015-07-23 19:37:23 -04:00
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