mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-11 03:45:19 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,197 Commits 106 Branches 109 Tags
df3ab025f8bcbec336e81ddbdfce7e24ef240a7b
Commit Graph
3197 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
stevegilvarry df3ab025f8 Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
Chris Wiggins d4654f63ae merge modern into feature-h264-videostorage 2013-10-04 10:52:53 +13:00
Chris Wiggins d3d3460f21 merge master into modern 2013-10-04 10:40:30 +13:00
Isaac Connor 21caddf97b This is a copy of the debian dir, the main change is to the Changelog so that the package gets built for precise 2013-10-03 13:53:37 -04:00
Isaac Connor 80d97c7bdf Merge branch 'master' of https://github.com/FoundationUniversity/ZoneMinder into FoundationUniversity-master 
Conflicts:
	distros/debian/changelog
 2013-10-03 11:36:26 -04:00
Isaac Connor 34f84a4097 Merge branch 'v1.26.4-beta' 2013-10-03 10:14:09 -04:00
Andy Bauer b505472be2 Update README.CentOS 
update documentation to add alter permission to zmuser
 2013-10-03 08:31:59 -05:00
Andy Bauer ea5c610fb1 Update README.Fedora 
added alter permission to zmuser
 2013-10-03 08:30:31 -05:00
mastertheknife 79b45bec68 Avoid trouble with whitespaces in current directory path 2013-10-03 15:37:46 +03:00
mastertheknife 883e676e29 Fixed path issues when creating packages (rpms and such) 2013-10-03 15:35:10 +03:00
mastertheknife 489e832cf6 Fixed typo in the last commit 2013-10-03 15:15:59 +03:00
mastertheknife 95803cc882 Merge branch 'cmake-improvements' 2013-10-03 15:10:06 +03:00
mastertheknife f043c6e955 Changed perl paths again, this time to <prefix>/<libdir>/perl5 and few improvements 2013-10-03 15:08:09 +03:00
Kyle Johnson 02e1a5eea6 Merge pull request #174 from POKKAHOH/rtsp-updates 
More RTSP support, decoding fragmented NAL, understand sprop-parametr-sets

 * Can now view more RTSP streams (including newer Axis cameras)
 * Decode fragmented NAL
 * Understand sprop-parametr-sets
 * Don't check unsetted video format (zm_remote_camera_rtsp.cpp)
 * Remove #else errors for avutils/ffmpeg
 2013-10-03 05:08:07 -07:00
Kyle Johnson 64f28a8b97 Merge pull request #193 from kylejohnson/191 
Moved writing of configure options from Controller to Model. Fixes #191.
 2013-10-02 05:28:57 -07:00
Kyle Johnson 60bebadecf Merge pull request #190 from kylejohnson/modern 
Moved zmBandwidth option from cookie to Configure:: option.  Might fix #175
 2013-10-02 05:28:33 -07:00
Kyle Johnson d1c19036ec Moved writing of configure options from Controller to Model. Fixes #191. 2013-10-02 08:25:48 -04:00
Kyle Johnson 19e5aec9ba Use the global zmBandwidth variable from Configure::read in the layout 2013-10-02 08:18:17 -04:00
Kyle Johnson e3db6e0edc Moved the zmBandwidth option from a cookie to global Configure:: option 
In addition I'm no longer passing this option around, instead calling it
where needed.  This _might_ fix #175 as the variable is being set very early on
in bootstrap.php
 2013-10-02 08:09:30 -04:00
mastertheknife 5fce4c516b Perl modules will be now be installed in <prefix>/<datadir>/zoneminder/perl5 2013-10-01 17:38:51 +03:00
Kevin Crider b0b0d8a521 Merge pull request #185 from kylejohnson/modern 
Moved the Config tabs to the sidebar
 2013-10-01 06:42:12 -07:00
Kyle Johnson 38944fb994 Merge pull request #179 from WDKevin/modern 
Added datetime picker support and implemented on events sidebar
 2013-10-01 06:28:29 -07:00
mastertheknife 9c2e48ca01 Attempt three at zm database stuff on travis 2013-10-01 15:39:36 +03:00
Kyle Johnson 83c744c7b7 Removed tooltips from jQuery UI 2013-10-01 08:39:16 -04:00
Kyle Johnson e61fbc4ba8 Bumped jQuery from 2.0.1 to 2.0.3 2013-10-01 08:39:02 -04:00
mastertheknife 48c7892071 Another attempt to create the ZM database in travis 2013-10-01 15:29:54 +03:00
POKKAHOH b0a014928e remove #else errors for avutils/ffmpeg 2013-10-01 16:05:49 +04:00
Kyle Johnson d3c221135d Moved the Config tabs to the sidebar 2013-09-30 10:28:45 -04:00
mastertheknife 5af8e0844c Few cmake improvements 2013-09-30 14:31:36 +03:00
Kevin Crider 84cd245462 Fixed full screen toggle so it stays in place when the page is scrolled 2013-09-29 14:08:58 -04:00
Kevin Crider 348399d61b Tweaked the appearence of the filter by monitor panel on the Events page 2013-09-29 14:05:25 -04:00
Kevin Crider de99655196 Fixed select all bug after performing a search 2013-09-29 13:59:19 -04:00
Kevin Crider f8ea2a777c Improved the loading animation 2013-09-29 12:51:59 -04:00
Andy Bauer ead696e5a7 Create zoneminder.f19.spec 2013-09-29 11:26:32 -05:00
Kevin Crider 33c0dff8a4 Fixed the search by date functionality 2013-09-29 11:36:23 -04:00
Chris Wiggins 9dc19fa32b Actually store video_data in the correct memory location 2013-09-29 12:55:42 +13:00
Chris Wiggins 76c8190e8b Update web frontend to correctly display video events 2013-09-29 12:23:28 +13:00
Kevin Crider 7e90d0f373 Added datetime picker support and implemented on events sidebar 2013-09-28 18:52:25 -04:00
Chris Wiggins 2dcee75100 Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into feature-h264-videostorage 2013-09-29 10:13:29 +13:00
Chris Wiggins 9c168a9af5 Check if videoing for bulk frame adding too 2013-09-29 10:10:16 +13:00
Andy Bauer 38963520f4 Update README.Fedora 
Updated documentation to reflect current issues/workarounds when running zoneminder on Fedora 19
 2013-09-28 15:18:45 -05:00
Chris Wiggins 8da327e9a3 Keep last keyframe so that as soon as the video starts to record, it has a keyframe to use rather than waiting 2013-09-28 23:26:28 +12:00
Chris Wiggins 35468a5b9c Tidy up starting and stopping of recording 2013-09-28 23:22:58 +12:00
Chris Wiggins 938f81c753 Add snapshot.jpg to event directory if we are doing a video recording 2013-09-28 23:17:22 +12:00
Chris Wiggins ff4b2c0908 Merge pull request #178 from ZoneMinder/cmake 
Add cmake to ZoneMinder thanks to @mastertheknife
 2013-09-28 03:51:00 -07:00
mastertheknife d171578cb8 Fixed not logging in to mysql with a password 2013-09-28 13:37:36 +03:00
mastertheknife 3321f26408 Modified .travis.yml to include kylejohnson's changes and fix it 2013-09-28 13:32:43 +03:00
mastertheknife db48a3d8fb Add matrix to the .travis.yml file 2013-09-28 13:04:41 +03:00
mastertheknife 48f11a8064 Add cmake to zoneminder 2013-09-28 12:59:50 +03:00
Chris Wiggins 65afc830b1 Save a snapshot image alongside the h264 video for thumbnail and poster use 2013-09-28 18:50:54 +12:00