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
3afad1a0a8
have to override ZoneMinder::Database::ZM_DB_USER, etc instead of just ZM_DB_USER.
2013-08-20 15:13:50 -04:00
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
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
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
6fd04f87a5
Merge pull request #81 from knnniggett/patch-4
...
Update Makefile.am
2013-08-19 12:20:37 -07:00
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
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
860c331d58
Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library
2013-08-18 15:01:46 -05:00
31daa32194
Added frameserver patch from Zoneminder Wiki
2013-08-18 13:28:55 -05:00
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
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
fcea4660cd
Minor formatting changes
2013-08-17 11:21:52 -04:00
d31e9a6c2c
Merge pull request #76 from knnniggett/patch-1
...
Added build notes for CentOS & RHEL
2013-08-17 08:19:43 -07:00
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
42c9b4e7a5
Added build notes for CentOS & RHEL
2013-08-17 08:52:24 -05:00
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
e8fa5694e8
Changing AUTOMAKE_OPTIONS from gnu to foreign to fix automake.
...
In commit 21ee8dbe02
2013-08-15 12:24:02 -04:00
4d6b9f7276
More updates to the Hungarian translation. #Fixes #45
2013-08-15 09:39:45 -04:00
cacf77a183
Merge pull request #37 from nagyrobi/patch-2
...
Update Hungarian translation - thanks to robi / @nagyrobi
2013-08-15 06:26:33 -07:00
0a79e4a975
1.26 Beta did not install SkyIPCam7xx.pm Control Script. Fixes #38
2013-08-15 09:08:51 -04:00
1fa04cc104
Update hu_hu.php
2013-08-14 22:38:37 +02:00
21ee8dbe02
Moved README to markdown language for github display
2013-08-14 12:38:42 -04:00
2df9c25df8
Updated release notes with something meaningful
2013-08-14 12:37:10 -04:00
4a03935d10
Added URLs to mastertheknife and nextime changes
2013-08-14 09:57:31 -04:00
1ed901edd1
Updated the changelog with some of the changes in this release
2013-08-13 14:17:40 -04:00
6c411b5c43
Merge branch 'release-1.26' of https://github.com/ZoneMinder/ZoneMinder into release-1.26
2013-08-13 12:40:03 -04:00
c9425a5626
iI decided to keep this just for reference
2013-08-13 12:39:42 -04:00
ee251b3c02
Removing lingering references to UsedPl
2013-08-13 12:34:59 -04:00
cb97c43ce7
Renamed db update file to match standard.
2013-08-13 11:12:02 -04:00
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
e2da7c37dc
bump version
2013-08-13 10:25:34 -04:00
c014f3faaa
delete generated files
2013-08-13 10:06:37 -04:00
0ec6622a9e
Cleaning up some build errors regarding Native Motion Detection
2013-08-13 09:59:30 -04:00
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
1888bec092
Doing my best to manually remove nextime's plugin architecture while keeping his other changes.
2013-08-13 09:43:23 -04:00
266b67d0bd
Support for control when monitor source is ffmpeg. This should fix #16 .
2013-08-13 08:34:37 -04:00
3a305522c4
Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop
2013-07-25 11:50:24 -04:00
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
bb19e80fa8
Support for control when monitor source is ffmpeg. This should fix #16 .
...
Some IP cameras need the source set to ffmpeg even though they are remote
cameras. These cameras do have a remote PTZ interface, but previously
when the monitor source was set to ffmpeg, the only control type
available was 'none'.
2013-06-15 19:50:19 -04:00
118e607839
clean
2013-05-10 14:03:17 -04:00
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
a468baf9eb
cleanup
2013-05-10 13:55:45 -04:00
2cd0237863
add some lines to create /var/run/zm. These day /run is a tmpfs, so the zm dir needs to be created on each boot
2013-05-10 13:42:09 -04:00
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
0a3ffb5e2e
fix control types dropdown for a new monitor
2013-05-09 14:11:20 -04:00
0da26d4f75
add a Controls preset for Airlink SkyIPCam 7xx cameras
2013-05-09 09:14:01 -04:00
7cf5475542
Merge ../ZoneMinder-kfir into kfir-proper
...
Conflicts:
configure
src/Makefile.am
src/Makefile.in
2013-05-02 21:28:51 -04:00
2c04d0774f
Reverting my web changes in develop - keeping them in modern
2013-05-02 10:20:06 -04:00
a16054b33f
Removed an HTML comment and changed the heading from 1 to 2.
2013-05-01 08:24:42 -03:00
Andy
Isaac Connor
Kyle Johnson
Andrew Bauer
nagyrobi
Isaac Connor