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

3024 Commits

Author SHA1 Message Date
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
Andy 594a44cbbb Update zmupdate.pl.in to give option to convert to InnoDB tables 
When upgrading the zoneminder database to 1.26, this proposed change will ask the user to convert existing MyISAM tables over InnoDB.  It first scans for existing MyISAM tables and will skip over any tables that are already converted to InnoDB.

I've tested this on (a copy of) a production database server and have verified it doesn't alter existing tables from a different schema.

And I'm done messing with the zmupdate script. I promise.
I understand if this change is considered outside the scope of a current bug fix release.
 2013-08-20 19:49:02 -05:00
Isaac Connor 3afad1a0a8 have to override ZoneMinder::Database::ZM_DB_USER, etc instead of just ZM_DB_USER. 2013-08-20 15:13:50 -04:00
Kyle Johnson 35c36bd769 Merge pull request #80 from knnniggett/corruptjpeg 
Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library
 2013-08-20 06:24:20 -07:00
Kyle Johnson de9b1af1a1 Merge pull request #79 from knnniggett/frameserver 
Added frameserver patch from Zoneminder Wiki

Changes the socket reader in zmf from a single read, to a loop read.
Incomplete reads would be reported even though the image writer wrote
the whole image to the socket. The problem was when the read went to
read the image frame from the socket, all the data had not yet been written
to the socket by the writer, so the reader thought there was a problem.
The loop reads from the socket until a full image frame is read, or there is
an error.

Originally at http://www.zoneminder.com/wiki/index.php/1.24.2_Patches
 2013-08-20 06:23:34 -07:00
Kyle Johnson 2333a8b445 Merge pull request #77 from knnniggett/patch-2 
Change default dB Engine from MyISAM to InnoDB
 2013-08-19 12:22:20 -07:00
Kyle Johnson 6fd04f87a5 Merge pull request #81 from knnniggett/patch-4 
Update Makefile.am
 2013-08-19 12:20:37 -07:00
Isaac Connor 34bfcb5e7e add lines to change the ZM_DB_USER and ZM_DB_PASS when the user and password are supplied on the command line. 
This is neccessary when the regular zm user does not have alter privileges.
 2013-08-19 11:19:34 -04:00
Andy 29ec57f64e Update Makefile.am 
zm_update-1.26.0.sql was not being copied with the rest of the sql scripts during install.
 2013-08-18 16:58:15 -05:00
Knniggett 860c331d58 Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library 2013-08-18 15:01:46 -05:00
Andrew Bauer 31daa32194 Added frameserver patch from Zoneminder Wiki 2013-08-18 13:28:55 -05:00
Kyle Johnson 543a1f2490 Merge pull request #78 from knnniggett/patch-3 
Don't check for gnutls-openssl on systems with older gnutls
 2013-08-17 08:26:31 -07:00
Andy e3576ccd17 Don't check for gnutls-openssl on systems with older gnutls 
This was causing a false warning on CentOS 6 w/ gnutls 2.8.5. It would otherwise compile and work fine despite the warning.
 2013-08-17 10:24:30 -05:00
Kyle Johnson fcea4660cd Minor formatting changes 2013-08-17 11:21:52 -04:00
Kyle Johnson d31e9a6c2c Merge pull request #76 from knnniggett/patch-1 
Added build notes for CentOS & RHEL
 2013-08-17 08:19:43 -07:00
Andy 050a5ac414 Change default dB Engine from MyISAM to InnoDB 
I have long ago converted my production zoneminder dB tables to InnoDB and have not experienced any side effects.  One benefit of using InnoDB is a significantly lesser chance of table corruption after an unclean shutdown.  Thoughts?
 2013-08-17 09:44:40 -05:00
Andy 42c9b4e7a5 Added build notes for CentOS & RHEL 2013-08-17 08:52:24 -05:00
Kyle Johnson 0a911d9d27 The .deps directory shouldn't have been included. Removing it. 
.deps is generated during configure (or is it make?).  Fixes #52
 2013-08-15 12:44:10 -04:00
Kyle Johnson e8fa5694e8 Changing AUTOMAKE_OPTIONS from gnu to foreign to fix automake. 
In commit 21ee8dbe02 I moved the README
file to README.md so that the markdown inside of the file would be displayed
on github.  This broke builds as AUTOMAKE_OPTIONS gnu requires the README
file to exist.
 2013-08-15 12:24:02 -04:00
Kyle Johnson 4d6b9f7276 More updates to the Hungarian translation. #Fixes #45 2013-08-15 09:39:45 -04:00
Kyle Johnson cacf77a183 Merge pull request #37 from nagyrobi/patch-2 
Update Hungarian translation - thanks to robi / @nagyrobi
 2013-08-15 06:26:33 -07:00
Kyle Johnson 0a79e4a975 1.26 Beta did not install SkyIPCam7xx.pm Control Script. Fixes #38 2013-08-15 09:08:51 -04:00
nagyrobi 1fa04cc104 Update hu_hu.php 2013-08-14 22:38:37 +02:00
Kyle Johnson 21ee8dbe02 Moved README to markdown language for github display 2013-08-14 12:38:42 -04:00
Kyle Johnson 2df9c25df8 Updated release notes with something meaningful 2013-08-14 12:37:10 -04:00
Kyle Johnson 4a03935d10 Added URLs to mastertheknife and nextime changes 2013-08-14 09:57:31 -04:00
Kyle Johnson 1ed901edd1 Updated the changelog with some of the changes in this release 2013-08-13 14:17:40 -04:00
Isaac Connor 6c411b5c43 Merge branch 'release-1.26' of https://github.com/ZoneMinder/ZoneMinder into release-1.26 2013-08-13 12:40:03 -04:00
Isaac Connor c9425a5626 iI decided to keep this just for reference 2013-08-13 12:39:42 -04:00
Kyle Johnson ee251b3c02 Removing lingering references to UsedPl 2013-08-13 12:34:59 -04:00
Kyle Johnson cb97c43ce7 Renamed db update file to match standard. 2013-08-13 11:12:02 -04:00
Isaac Connor 940f7a191e add code to add Colours and Deinterlacing to Monitors table. These were added by mastertheknife's perfpatch. 2013-08-13 11:05:20 -04:00
Isaac Connor e2da7c37dc bump version 2013-08-13 10:25:34 -04:00
Isaac Connor c014f3faaa delete generated files 2013-08-13 10:06:37 -04:00
Kyle Johnson 0ec6622a9e Cleaning up some build errors regarding Native Motion Detection 2013-08-13 09:59:30 -04:00
Kyle Johnson c3f468eb8c Fixing zm_image_analyser.h:13:25: fatal error: zm_detector.h: No such file or directory 2013-08-13 09:53:31 -04:00
Kyle Johnson 1888bec092 Doing my best to manually remove nextime's plugin architecture while keeping his other changes. 2013-08-13 09:43:23 -04:00
Isaac Connor 266b67d0bd Support for control when monitor source is ffmpeg. This should fix #16. 2013-08-13 08:34:37 -04:00
Isaac Connor 3a305522c4 Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop 2013-07-25 11:50:24 -04:00
Isaac Connor cdac403fb1 Merge ../zum into develop 
Conflicts:
	AUTHORS
	configure.ac
	db/zm_create.sql.in
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/zmupdate.pl.in
	src/Makefile.am
	src/zm_buffer.cpp
	src/zm_config_defines.h
	src/zm_event.cpp
	src/zm_ffmpeg.h
	src/zm_ffmpeg_camera.cpp
	src/zm_image.cpp
	src/zm_jpeg.h
	src/zm_local_camera.cpp
	src/zm_logger.cpp
	src/zm_mem_utils.h
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_mpeg.cpp
	src/zm_remote_camera_http.cpp
	src/zm_remote_camera_rtsp.cpp
	src/zm_rtsp.cpp
	src/zm_sdp.cpp
	src/zm_sdp.h
	src/zm_stream.cpp
	src/zm_thread.cpp
	src/zm_thread.h
	src/zm_threaddata.cpp
	src/zm_user.cpp
	src/zm_user.h
	src/zm_utils.cpp
	src/zm_zone.cpp
	src/zm_zone.h
	web/includes/actions.php
	web/lang/big5_big5.php
	web/lang/cn_zh.php
	web/lang/cs_cz.php
	web/lang/de_de.php
	web/lang/dk_dk.php
	web/lang/en_gb.php
	web/lang/es_ar.php
	web/lang/et_ee.php
	web/lang/fr_fr.php
	web/lang/he_il.php
	web/lang/hu_hu.php
	web/lang/it_it.php
	web/lang/ja_jp.php
	web/lang/nl_nl.php
	web/lang/pl_pl.php
	web/lang/pt_br.php
	web/lang/ro_ro.php
	web/lang/ru_ru.php
	web/lang/se_se.php
	web/skins/classic/js/skin.js
	web/skins/classic/views/js/monitor.js.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/zone.php
 2013-07-25 11:49:55 -04:00
Kyle Johnson f1d9de75b0 Point root to the Monitors index action 2013-07-19 09:30:08 -04:00
Kyle Johnson 46deb93f74 Events index view is now at a semi-usable state, similar to the original skin. 
In the interest of releasing something, I am not going to use ajax here
for now.  Goal is to have this view behave similar to the original Events
view in the original skin.  Currently you can:

  * Paginate events
  * Filter events using the sidebar

Bug:  Filter elements are unset when paginating.
 2013-07-19 07:30:13 -04:00