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

6091 Commits

Author SHA1 Message Date
Linwood-F c4599cdeda Fix bug report on 100% scale 2 2015-08-09 20:30:42 -04:00
Linwood-F 938a2e7de2 Fix bug report on 100% scale 2015-08-09 20:14:33 -04:00
Linwood-F 4fedb5fce0 Fix typo in last commit 2015-08-09 18:41:12 -04:00
Linwood-F 6da8da9d8d Add ability to do either height or width or both 2015-08-09 18:19:12 -04:00
Linwood-F 3b5638e54d Fix omitted reference to gif file 2015-08-09 13:12:45 -04:00
Linwood-F 6425df76c7 Switch to the standard routine in web functions include for auth 2015-08-09 13:10:43 -04:00
Linwood-F 7a76cb3df1 Add security for those using authorization 2015-08-09 12:24:04 -04:00
Linwood-F 6aca6c8d26 Demote user auth info message to debug 2015-08-09 12:16:01 -04:00
Linwood-F 34c2902570 Add scale as optional feature to image.php 2015-08-09 12:02:13 -04:00
Linwood-F 9d7dc0d81b Safari compatibility changes 2015-08-07 23:27:26 -04:00
Linwood-F bf655b6656 Corrections from askers testing. 2015-08-07 22:26:03 -04:00
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
Linwood-F 3ce365ea8c Tweaks to live display to remove sliders in fit mode and general fixes 2015-08-06 15:42:04 -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 278434ec3f Fix regression in last commit where ALL not working 2015-08-03 22:00:00 -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
Linwood-F 76c037f06a Fix bug in scale calling to zms 2015-08-03 16:36:14 -04:00
Linwood-F e7264a8167 Minox fixes, make live mode default, 1 hour default 2015-08-03 15:31:13 -04:00
Linwood-F 42f77377f2 Add a fit feature to fit all monitos on screen 2015-08-02 16:15:18 -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
Linwood-F 4354cbeecb More minor changes, last in prelude of next version 2015-07-30 19:01:27 -04:00
Linwood-F 3e85d57710 New version with added live view 2015-07-30 12:06:52 -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
Isaac Connor f75cb596bc Merge pull request #972 from SteveGilvarry/h264_fixes 
feature-h264-videostorage compile fixes and some cleanup.
 2015-07-29 07:50:45 -04:00
Emmanuel Papin f7cfa1ecd4 Fix analysis sample rate calculation 2015-07-28 23:07:02 +02:00
Andrew Bauer 42e021e652 Merge pull request #976 from SteveGilvarry/FrameImageGen 
Dynamically create jpegs from video file for viewing in browser
 2015-07-28 10:10:38 -05:00
Andrew Bauer cf2ebc64fc Merge pull request #975 from SteveGilvarry/h264_playback 
Add H264 playback speed controls
 2015-07-28 09:34:34 -05:00
Michael 5c44285f98 dynamically create jpegs from video file for viewing in browser 2015-07-29 00:24:05 +10:00
SteveGilvarry c7c27d7009 Merge remote-tracking branch 'upstream/feature-h264-videostorage' into h264_playback 
Conflicts:
	web/skins/classic/views/event.php
 2015-07-29 00:14:12 +10:00
Michael 7502e5b3e3 added control for video playback rate 
Conflicts:
	web/skins/classic/views/event.php
 2015-07-29 00:07:19 +10:00
Andrew Bauer bb0c016d3d Merge pull request #974 from SteveGilvarry/h264_jpeg_mode 
Fix to display thumbnails when only storing snapshot.jpg
 2015-07-28 08:55:52 -05:00
Andrew Bauer 41830be6ff Merge pull request #973 from SteveGilvarry/h264Orientation 
Videojs orientation for feature-h264-videostorage
 2015-07-28 08:45:48 -05:00
Michael d83349cc7f fix to display thumbnails when only storing snapshot.jpg 2015-07-28 23:43:50 +10:00
Michael 477c34cc2c Added missing brackets 2015-07-28 23:08:45 +10:00
Michael 6c8dbb8bea Typo 
added missing "
 2015-07-28 23:08:10 +10:00
Michael e6e1427c48 added missing videojs.zoomrotate.js file 
added missing videojs.zoomrotate.js file
 2015-07-28 23:06:03 +10:00