Andy Bauer
4cc80d4cc5
Update zoneminder.1.26.el6.spec
...
Removed reference to a patch that has been added upstream
2013-09-14 12:14:08 -05:00
Andy Bauer
a6d3b35996
Delete zoneminder-1.25.0-installfix.patch
...
no longer needed. Fix has been added to latest branch.
2013-09-14 12:11:49 -05:00
Richard Kojedzinszky
0f5c90bbe4
Rewritten the query to allow mysql to use indexes
...
On a system with heavy logging, without this the login procedure took
too long.
2013-09-12 22:46:26 +02:00
Andy Bauer
0dd98ccdd1
Merge pull request #119 from knnniggett/zmupdate_zm.1.26.3
...
Update zmupdate.pl.in for 1.26.3 release
2013-09-10 11:16:10 -07:00
Andy Bauer
1d664f22ac
exclude zm_update-1.26.3.sql since it has already been added
2013-09-10 13:14:16 -05:00
Andy Bauer
0bf9aacab2
Update zmupdate.pl.in for 1.26.3 release
2013-09-10 12:46:33 -05:00
Kyle Johnson
57ce1bed8d
Adding the db/zm_update file so that the upgrade script works
2013-09-10 13:42:56 -04:00
mastertheknife
a44bc63d29
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into mybranch
2013-09-10 19:23:04 +03:00
Kyle Johnson
219f21a904
Bumping the version numbers.
2013-09-10 11:50:39 -04:00
mastertheknife
2b568906e5
Fixed greyscale four field deinterlacing not processing last line, broken ssse3 color->greyscale conversion and improved error handling when reading\decoding jpegs
2013-09-10 18:37:56 +03:00
Isaac Connor
f8c4897031
put this back so we can get on with life
2013-09-10 08:52:59 -04:00
Kyle Johnson
64ec75b7a5
Updated AUTHORS to reflect recent changes to the project
2013-09-09 10:06:36 -04:00
mastertheknife
c9cf31b271
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2013-09-09 17:04:02 +03:00
Kyle Johnson
45c32951b7
Point to the GitHub issues page for the list of current bugs
2013-09-09 09:45:29 -04:00
mastertheknife
caa73f608b
Merge remote-tracking branch 'origin/develop'
2013-09-09 16:44:58 +03:00
Isaac Connor
1b2b21d1bb
rough in a quick script to help people generate the build files
2013-09-08 15:15:58 -04:00
Kyle Johnson
6c134f9b4b
Merge pull request #116 from knnniggett/zmupdate_newrelease
...
Add 1.26.1 and 1.26.2 releases to zmupdate
2013-09-07 19:07:37 -07:00
Knniggett
0268389907
initial upload of files used to build rpm
2013-09-07 16:51:54 -05:00
Knniggett
8f3d95fd38
modify zmupdate.pl.in
2013-09-07 15:11:57 -05:00
Knniggett
d4179035de
Modify zmupdate for 1.26.1 and 1.26.2 releases
2013-09-07 15:08:09 -05:00
Isaac Connor
9c7f02e8c0
Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop
...
Conflicts:
scripts/zmupdate.pl
2013-09-06 14:44:21 -04:00
Isaac Connor
0a9e63ca2c
remove autogenerated files
2013-09-06 14:40:55 -04:00
Isaac Connor
b37606ed9a
update link to README to be README.md
2013-09-06 14:35:08 -04:00
Kyle Johnson
f604872eb3
Forgot to bump the version number for 1.26.1. Fixes #113
2013-09-06 13:29:05 -04:00
Chris Wiggins
fbbce3700d
Merge pull request #111 from chriswiggins/master
...
Use GitHub repo for version check
2013-09-05 18:51:29 -07:00
Kyle Johnson
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
Kyle Johnson
96b5887e69
Include missing make and configure files. Fixes #107
2013-09-05 20:08:22 -04:00
Kyle Johnson
4cc878e930
Merge branch 'release-1.26' into develop
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm
2013-09-05 11:40:38 -04:00
Kyle Johnson
f00372ee94
Merge branch 'release-1.26'
2013-09-05 11:33:08 -04:00
Kyle Johnson
a4c399a217
Pointed the ChangeLog to the commits url
2013-09-05 11:32:48 -04:00
Kyle Johnson
c02d496d23
More CakePHP cleanup - missed it in 2c04d0774f
2013-09-05 10:52:55 -04:00
Chris Wiggins
d6440ca70e
Change repo to ZoneMinder for pull request
2013-09-05 23:50:51 +12:00
Chris Wiggins
e792c8eb44
Move version check from zoneminder.com to repository
2013-09-05 23:40:03 +12:00
Kyle Johnson
d47aaec775
Merge pull request #92 from knnniggett/patch-9
...
Update getBrowser() to match IE10
2013-09-03 06:38:13 -07:00
Kyle Johnson
93631c0ac4
Fixing AM_CONFIG_HEADER is deprecated in automake > 1.13. Should fix #94 .
2013-08-30 21:57:52 -04:00
Kyle Johnson
2f92689d7e
Resolving CVE-2013-0232 - this should fix #93 .
2013-08-30 21:53:19 -04:00
Kyle Johnson
c9dce2363b
Merge pull request #95 from knnniggett/patch-10
...
Fix "Can't stat : No such file or directory" message
2013-08-30 18:48:48 -07:00
Kyle Johnson
52116f9642
Merge pull request #84 from knnniggett/patch-5
...
Update zmupdate.pl.in to give option to convert to InnoDB tables
2013-08-30 18:47:34 -07:00
Andy
3764000f81
Fix "Can't stat : No such file or directory" message
...
Many zoneminder systems have a "Can't stat : No such file or directory" in their logs each time zmfix is run. The problem was traced back to the sql query, which looked for a ControlDevice field that was not null. However, the ControlDevice field is empty, rather than null, when there is no control device.
2013-08-30 14:30:47 -05:00
Andy
de51926434
Update getBrowser() to match IE10
...
Updates the preg_match expression to match Internet Explorer 10. The previous pattern would not detect IE10, and hence zoneminder would not attempt to stream via Cambozola, which leaves IE10 users looking at a broken link.
NOTE: There is another file in the zoneminder source tree, AssetDispatcher.php, that also uses the same pattern match expression. It is part of the Cake folder, which I am not familiar with. Please advise if we should edit that file as well.
2013-08-29 17:41:20 -05:00
Kyle Johnson
396dedc21a
Merge pull request #90 from knnniggett/patch-8
...
zms crashes with hashed authentication - fixes #88
Previously, systems without gnutls were computing auth_md5 to be twice the size of what it was defined to be, thus causing zms to crash. The for loop at line 227 builds auth_md5 by looping every "2j", which means the upper limit (md5len) should be half the desired size of auth_md5.
2013-08-28 05:32:01 -07:00
Andy
4e9698ae13
Fix for Issue #88 - ZMS crashing
...
Previously, systems without gnutls were computing auth_md5 to be twice the size of what it was defined to be, thus causing zms to crash. The for loop at line 227 builds auth_md5 by looping every "2j", which means the upper limit (md5len) should be half the desired size of auth_md5.
2013-08-28 07:22:41 -05:00
Kyle Johnson
a33ddcb307
Merge pull request #89 from knnniggett/patch-7
...
Fixed typo
2013-08-27 17:36:30 -07:00
Andy
e18c08356e
Fixed typo
...
line 614 was missing a trailing semicolon
2013-08-27 18:35:27 -05:00
Kyle Johnson
69f31d9e90
Merge pull request #85 from knnniggett/addptzcameras
...
Add PTZ control files and presets for FOSCAM FI8608W PT, FI8620 PTZ, 9821W PTZ and Loftek Sentinel IP
2013-08-26 09:48:37 -07:00
Knniggett
bac2d89a8d
Add PTZ control files and camera presets for specific ptz cameras
2013-08-25 18:52:09 -05:00
Kyle Johnson
362ceaebd7
Merge pull request #87 from knnniggett/patch-6
...
edit zmupdate function in init script
2013-08-25 13:29:47 -07:00
Andy
2f456967f4
edit zmupdate function in init script
...
Noticed the init script was looking for a zm_update, which doesn't exist. My best guess is that this should be changed to zmupdate.pl. This causes zoneminder to reload its configuration from the database prior to startup. Thoughts?
2013-08-22 14:13:22 -05:00
Knniggett
8608250b06
This adds PTZ control files and camera presets for specific ptz cameras.
2013-08-22 13:20:38 -05:00
Knniggett
2263793b49
Adds PTZ controls & camera presets for specific cameras. (NOTE TO SELF: remove ~ files)
2013-08-22 13:14:28 -05:00