3cee6a133d
Merge remote-tracking branch 'Sune1337/motion/FrameSkip'
...
Conflicts:
db/zm_update-1.27.1.sql
web/lang/nl_nl.php
2014-04-22 20:13:11 +03:00
0dbcc836b4
Merge pull request #325 from elenril/master
...
Support building with new libavcodec versions.
2014-04-19 00:08:39 +03:00
2f542b2396
Merge pull request #395 from hamiltont/patch-6
...
Remove SVN install from Travis CI
2014-04-18 23:23:14 +03:00
b196965c4c
Remove SVN install from Travis CI
2014-04-18 13:26:25 -04:00
f2dbb1fe08
Dockerfile works properly, documentation updated
...
- Dockerfile now builds properly
- Dockerfile now ADDs files from local directory. This allows
you to either pull from github (for master) or to build
locally (for development)
- Removes some dependencies from container (wget, git)
- Removes pulling apache virtual host file from github
- Upgrades MySQL start check to actually check instead of just
sleeping
2014-04-18 12:39:05 -04:00
fd4f77b145
Merge pull request #381 from m-bene/flatLayout2
...
Fix window sizes and input field sizes for flat skin
2014-04-18 09:40:00 -04:00
4b7f1896b9
Merge pull request #385 from maciekczwa/master
...
fix sql error which prevents remote login from working
2014-04-18 09:39:09 -04:00
83b2b0c619
Merge pull request #380 from m-bene/switchLayout
...
Fix reload loop on switching skins
2014-04-18 09:38:17 -04:00
cf3283b1a1
Merge pull request #393 from hamiltont/patch-4
...
Remove Subversion from prerequesite lists
2014-04-18 09:36:54 -04:00
cda3f981e6
Merge pull request #390 from hamiltont/patch-1
...
Remove apt-get upgrade from Dockerfile
2014-04-18 09:30:07 -04:00
e5d2f6af7a
Remove Subversion from prerequesite lists
2014-04-18 02:53:16 -04:00
7b62780292
Remove apt-get upgrade
...
Convention is to avoid this if not needed, as there is no init
system and some packages have to be held back. upgrade will
sometimes break due to the state of ubuntu:latest
To see the official issue: dotcloud/docker#1724
To see workarounds: https://github.com/racker/docker-ubuntu-with-updates/blob/master/precise/Dockerfile
2014-04-17 23:05:23 -04:00
ca2b6f36f5
Update README.OpenSuse
...
Additional info on amending database if using version which has /tmp as work space
2014-04-17 15:44:44 -04:00
103dc0c00d
Update CMakeLists.txt
...
Adds named variables to ease change in the future
2014-04-17 15:42:37 -04:00
ee7fe5bfaa
Update zoneminder.cmake.OS13.spec
...
Correct requires for cpanm and make as they should be post
change cpanm call to be full path name
correct permissions on events, images and temp
2014-04-17 15:41:04 -04:00
50a9055601
fix sql error which prevents remote login from working
2014-04-13 09:54:11 +02:00
b56093a637
Fix window sizes and input field sizes for flat skin
2014-04-11 09:53:46 +02:00
f737af15b9
Fix reload loop on switching skins
2014-04-11 09:40:23 +02:00
a8a0bf922f
Move initializer for last_motion_score to avoid compiler warning "...zones will be initialized after ... last_motion_score ... when initialized here"
2014-04-10 15:53:28 +02:00
6c637947e2
Ability to skip frames in motion detection.
...
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
2014-04-10 14:59:34 +02:00
db5a8fe194
Merge pull request #375 from m-bene/flatLayout
...
Fix small / cropped DRV controls in event view. Fixes #356
2014-04-09 16:45:15 -04:00
bd5e25644e
same dvr controlls in event as in monitor
2014-04-09 20:19:23 +02:00
afc7581146
use zmDbConnect instead of all the DBI connect stuff
2014-04-09 10:34:58 -04:00
35468af815
Merge pull request #338 from m-bene/extendPreclusive
...
add feature to extend preclusive zone alarm state by x frames
2014-04-08 08:04:37 -05:00
8bd7f131bf
Merge pull request #367 from PX03AFK/patch-3
...
Update zoneminder.tmpfiles
2014-04-08 07:48:38 -05:00
8fb83e867c
Merge pull request #374 from m-bene/parseFilters
...
do not quote column names in parse filter
2014-04-08 07:40:25 -05:00
f22b956b8b
do not quote column names in parse filter
2014-04-08 09:07:59 +02:00
221f9afa6c
Merge pull request #373 from m-bene/filterTermsUndefined
...
Fix 'Undefined index: filter' php warnings for filter view when
2014-04-07 15:24:54 -05:00
9a714f8d6d
Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments
2014-04-07 16:11:48 +02:00
9edb55d9af
Modify window size to exclude task bar area
2014-04-07 12:07:29 +02:00
5cd165e9d5
Update zoneminder.tmpfiles
...
Incorrect directory
2014-04-03 22:16:38 -04:00
b126ca3e01
modify play button
2014-03-30 11:18:14 -05:00
3f7f398210
rework prev and next buttons
2014-03-28 17:18:34 -05:00
329f6ae5c4
Merge branch 'mysql2PDO'
2014-03-28 10:16:14 -04:00
3212974bdf
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-03-28 10:12:39 -04:00
d221b2de4c
Merge pull request #353 from barjac/master
...
Update zmupdate.pl.in
2014-03-27 17:59:15 -05:00
dda1034927
Merge pull request #362 from PX03AFK/patch-2
...
Update zoneminder.cmake.OS13.spec
2014-03-27 17:58:27 -05:00
52081200f2
Merge pull request #361 from PX03AFK/patch-1
...
Update README.OpenSuse
2014-03-27 17:58:01 -05:00
c4645de0e6
Update zoneminder.cmake.OS13.spec
2014-03-26 23:06:42 -04:00
a7a5f5d543
Update README.OpenSuse
2014-03-26 23:05:20 -04:00
fec72f05d0
fix eyezm authentication issue
2014-03-25 18:48:20 -05:00
d60b4a2eee
Merge pull request #352 from m-bene/CurlHeaderCase
...
make curl header check case insensitive
2014-03-25 17:23:56 -05:00
264b98548f
Fix prev button while in gapless mode. All buttons tested and working.
2014-03-25 17:12:26 -05:00
d2be7d4cd8
Update zm_event.cpp
...
Commit 79af2adaa0
2014-03-25 07:01:40 -05:00
888fafe767
Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO
2014-03-24 13:44:19 -04:00
d6a27b31e8
fix extra }
2014-03-24 13:44:06 -04:00
ef2b4955a2
Removed extra }. Fixes #354
2014-03-24 13:36:04 -04:00
fd9e808fe1
Update zmupdate.pl.in
...
Fix typo 'from' version replaced with 'to' version.
2014-03-24 13:35:53 +00:00
32941cfef7
make curl header check case insensitive
2014-03-23 07:06:54 +01:00
957d6f123f
remaining conversions
2014-03-22 14:16:56 -04:00
Kfir Itzhak
Hamilton Turner
Kyle Johnson
David Wilcox
Maciej Czerniak
m-bene
Sune1337
Isaac Connor
Andrew Bauer
Kyle Johnson
barjac