Andy Bauer
5fe50152ff
Update README.Fedora
2013-10-05 17:21:30 -05:00
Andy Bauer
2d1d0a3ad3
Rename zoneminder.tmpfiles.d to zoneminder.tmpfiles
2013-10-05 17:05:33 -05:00
Andy Bauer
2bdc1a3fae
Create zoneminder.tmpfiles.d
2013-10-05 16:56:42 -05:00
Andy Bauer
50fea88690
Rename redalart.wav to redalert.wav
...
fix typo
2013-10-05 15:49:28 -05:00
Kfir Itzhak
38e2244fa9
Merge pull request #199 from knnniggett/rmsourcedir
...
remove ${CMAKE_CURRENT_SOURCE_DIR} from zm perl modules target
2013-10-05 12:46:16 -07:00
Knniggett
d0cbb3f498
remove ${CMAKE_CURRENT_SOURCE_DIR} from add_custom_target
2013-10-05 14:29:12 -05:00
Kfir Itzhak
96902c216d
Fix comparison sign warning introduced in pull request #174 commit 33b6e5c
2013-10-05 16:42:13 +03:00
mastertheknife
e12a9dc408
Fixed compilation failure when zlib is not available
2013-10-04 23:20:39 +03:00
mastertheknife
3dbef94b04
Removed INSTALLDIRS from the cmake perl modules CMakeLists.txt
2013-10-04 22:50:50 +03:00
mastertheknife
5607f2823f
Fixed missing perl5 in path in the last commit
2013-10-04 22:40:09 +03:00
mastertheknife
9c3540a952
Attempt to fix issues with perl paths that andy is experiencing
2013-10-04 22:35:16 +03:00
mastertheknife
c795afc833
Updated ZM version in cmake to 1.26.4
2013-10-04 19:53:59 +03:00
Isaac Connor
4b1ee3cae7
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2013-10-04 11:56:46 -04:00
Isaac Connor
60258e7aa1
Check the size of the mmap file before mmaping it. If the mmap file 0 ( can happen with remote cameras that can't be reached because it is offline ) we get sigbus. I think the mmap succeeds, but is zero sized, so the first access causes SIGBUS.
2013-10-04 11:54:21 -04:00
Kevin Crider
2649b1f827
Merge pull request #194 from WDKevin/master
...
Added missing word in readme
2013-10-04 06:33:03 -07:00
Kevin Crider
f4a37bbb12
Added missing word in readme
2013-10-04 09:32:00 -04:00
Andy Bauer
1afa52637e
Update zoneminder.f19.spec
...
gcc4.7/4/8 patch no longer needed
2013-10-04 06:39:44 -05: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
d664f3bb6e
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2013-10-03 10:37:04 -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