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

5105 Commits

Author SHA1 Message Date
Isaac Connor 98c0f2478e Merge pull request #1087 from liucougar/fix_timeline_for_SaveJPEGs 
fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)
 2015-10-06 08:36:08 -04:00
Heng Liu 59b0675588 only expose monitor info which are being used in client 2015-10-02 20:04:10 -07:00
Heng Liu 2fd6cbe742 fix timeline view for SaveJPEGs monitors (without enabled VideoWriter) 2015-10-01 22:41:31 -07: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
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
Michael 2d4c2bbe0a Beautify! 
Make the code somewhat readable.
 2015-07-28 23:05:06 +10:00
user 46204c2768 local storage of video js plugin 2015-07-28 23:03:59 +10:00
user 2e8d88915b removed redundant field in sql query 
Conflicts:
	web/skins/classic/views/event.php
 2015-07-28 23:02:56 +10:00
user 05e82d2a96 proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate 
Conflicts:
	web/skins/classic/views/event.php
 2015-07-28 22:55:27 +10:00
SteveGilvarry 8bf5d93b30 Merge remote-tracking branch 'upstream/feature-h264-videostorage' into h264_fixes 2015-07-28 22:10:37 +10:00
Andrew Bauer de875d7c4b Merge pull request #971 from SteveGilvarry/feature-h264-videostorage 
Merging Master to feature-h264-videostorage
 2015-07-28 07:06:57 -05:00
SteveGilvarry 4dc0028e11 Clean up videostore code and remove lots of unused code 2015-07-28 21:41:10 +10:00
Isaac Connor 1e60fccd81 Cherry-Pick from iconnor - make it compile on ubuntu 15.04. Which is libav 56.1.0 
Conflicts:
	src/zm_ffmpeg.cpp
	src/zm_remote_camera_rtsp.cpp

Conflicts:
	distros/ubuntu1204/changelog
 2015-07-28 21:39:47 +10:00
SteveGilvarry f09a551d6a Merge branch 'master' into feature-h264-videostorage 2015-07-28 21:06:52 +10: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
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
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