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

507 Commits

Author SHA1 Message Date
Pliable Pixels 754091b55d Added isRunning column 2015-06-21 09:30:23 -04:00
Pliable Pixels d2472f177d Added isRunning column 2015-06-21 09:30:14 -04:00
Pliable Pixels b41538fe65 Added definition for Foscam FI8918W 2015-06-19 15:51:07 -04:00
Pliable Pixels 67f1914e26 Added definition for Foscam FI8918W 2015-06-19 15:48:03 -04:00
Pliable Pixels be4a434dbd Added 9831W to update script 2015-06-19 13:57:19 -04:00
Pliable Pixels 35e8a9d89b Added 9831W to PTZ protocol DB 2015-06-19 13:06:00 -04:00
Andrew Bauer 30765fdedf hide USE_DEEP_STORAGE 2015-04-12 12:20:20 -05:00
Andrew Bauer e17bad3061 add onvif ptz control into update script 2015-02-21 11:33:49 -06:00
Andy Bauer 9f3ff787d1 Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_create.sql.in
	distros/redhat/archive/zoneminder.el6.spec
	distros/redhat/zoneminder.el6.spec
	web/skins/classic/views/monitor.php
 2015-02-18 18:53:47 -06:00
Isaac Connor ed61d2b925 alter the type of Device in the Monitors table to tinytext, which matches the MonitorPresets table, and increases the length to 255 2014-12-10 16:56:22 -05:00
Isaac Connor 70c63bd394 Merge branch 'master' into storageareas 
Conflicts:
	db/zm_create.sql.in
	distros/debian/control
	distros/ubuntu1204/changelog
	src/CMakeLists.txt
	src/zm_config_defines.h
	src/zm_monitor.h
 2014-11-19 14:11:39 -05:00
jmcastro2014 af57c177d7 Update zm_create.sql.in 
Add Control 3S N5071 Dome Ptz Camera
 2014-11-12 08:47:35 -03:00
Isaac Connor 85529efffc check for existence of the columns beefore trying to add them 2014-10-22 10:31:23 -04:00
Andrew Bauer 71b56a163d Zoneminder 1.28.0 Release 2014-10-18 15:23:13 -05:00
Jan M. Hochstein f1b2ba091c Update meta makefiles 2014-09-12 16:06:19 +02:00
Isaac Connor d1b1c35e48 these fields need to be able to be nul 2014-09-08 17:10:49 -04:00
Isaac Connor 2b4fb7af26 drop not nuls from new V4L fields 2014-08-27 09:42:06 -04:00
Andrew Bauer 254dffa633 Move ONVIF control script & add dB entry 2014-08-03 15:52:59 -05:00
Isaac Connor 2087780ec1 tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set 2014-07-29 14:43:13 -04:00
Isaac Connor 0d229182f7 add the db updates for the V4L changes 2014-07-24 14:38:51 -04:00
Isaac Connor 9385471392 move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera 2014-07-13 16:39:27 -04:00
Isaac Connor 5c27ba8b1f I don't know why this never has the right # of coumns, so let's be specific 2014-07-09 11:44:07 -04:00
Isaac Connor 90b06060af fix missing ExtendAlarmFrames column when add Default ZonePreset 2014-06-26 11:17:09 -04:00
Isaac Connor b48d06b279 change commands to handle if db already has the User and Pass fields 2014-06-13 16:09:01 -04:00
Kfir Itzhak 5fea101294 Merge pull request #421 from m-bene/ffmpegoptions 
Add optional options field for ffmpeg and VLC source types
 2014-05-18 18:07:42 +03:00
Kfir Itzhak bad679e026 Merge pull request #426 from m-bene/extendPreclusive 
Add new colum ExtendAlarmFrames to db/zm_create.sql.in
 2014-05-08 05:41:58 +03:00
m-bene 79a13cf750 adjust inserts to ZonePresets 2014-05-08 03:49:48 +02:00
m-bene aae6dbed13 Add new colums to zm_create.sql.in 2014-05-08 02:53:44 +02:00
m-bene a6a9d9f270 add Options field to zm_create.sql.in 2014-05-08 02:30:54 +02:00
m-bene ceff5a98ea add generic Option field to ffmpeg and libvlc cameras 2014-05-05 13:29:12 +02:00
m-bene 9fb794f4d0 add option field zo monitors 2014-04-25 13:23:06 +02:00
Kfir Itzhak 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
Sune1337 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
m-bene da8ac0726d make db update safe to run multiple times 2014-03-20 22:02:58 +01:00
m-bene 9ce51755ff add ExtendAlarmFrames Fields to Zones and ZonePresets 2014-03-20 10:26:48 +01:00
Isaac Connor 0cd3e33fb1 add db inserts to add WanscamPT controls 2014-03-19 12:20:19 -04:00
Andrew Bauer 5dbe34d96d This commit adds to the bottom of the presets list the default zone preset value which would come with the original fresh install. 2014-02-26 08:07:30 -06:00
Andrew Bauer e8be3cb571 Merge remote branch 'nagyrobi/patch-8' into nagyrobi 2014-02-26 07:57:42 -06:00
Andrew Bauer c3200dfec7 Update zm_create.sql.in 
Enable delete filter by default.  Increase limit to 100 events.
 2014-02-20 14:10:54 -06:00
Andrew Bauer 563c526d98 Update zm_update-1.27.0.sql 2014-02-01 12:56:18 -06:00
Andrew Bauer 5978f69af4 Rename zm_update-1.26.6.sql to zm_update-1.27.0.sql 
Renamed to reflect 1.27 release
 2014-02-01 12:56:01 -06:00
Andrew Bauer ed40ee4d11 Update zm_create.sql.in 
Fix typo created during a manual merge
 2014-01-17 09:54:37 -06:00
Andrew Bauer b2b9f3f466 Merge branch 'master' of https://github.com/Tim-Craig/ZoneMinder into Tim-Craig-master 
Conflicts:
	db/zm_create.sql.in
 2014-01-17 09:50:05 -06:00
Andrew Bauer 532d1ba413 Update zm_create.sql.in 
Don't explicitly set the Id number of each ptz control.  The auto increment flag has previously been turned on so mysql will insert the proper value for us when we create a new record. This will make the list of ptz controls easier to manager as the list gets bigger.
 2014-01-17 08:42:26 -06:00
Andrew Bauer c2a0c5917d Update zm_create.sql.in 
Changed the CaSe on a few INSERT INTO statements for consistency.
 2014-01-17 08:38:54 -06:00
Andrew Bauer 10ebb7442c Update zm_create.sql.in 
When creating a new dB, we should drop the Logs table if it already exists, just like we do with the other tables.
 2014-01-17 08:35:37 -06:00
tim 05e395613b Adding PTZ module for Toshiba IK-WB11A 2014-01-14 00:58:12 -08:00
Kfir Itzhak 9901ce9e84 Merge remote branch 'origin/master' into curl 2014-01-05 10:16:01 +02:00
Kfir Itzhak a962815624 Change default alarm blend percent to 6 and make upgrades smooth by copying the existing blend percent to the alarm one 2014-01-05 08:59:09 +02:00
Isaac Connor b3af313370 Merge pull request #282 from scottgrobinson/master 
Add zmMontageScale so montage scale is also 'saved'
 2014-01-02 11:18:39 -08:00
Andrew Bauer 2f3934c20e Merge pull request #289 from dmak/foscam 
Foscam IP cameras control script
 2014-01-01 07:30:46 -08:00
Dmitry Katsubo b370f98004 Improved the script using advise from http://stackoverflow.com/a/16405301/267197 so that re-running the script does not crash reinstall. 2013-12-30 15:32:20 +01:00
Dmitry Katsubo 3fb76eaf35 Initial version of control file for Foscam IP cameras. 
Taken from http://www.zoneminder.com/wiki/index.php/Foscam
 2013-12-29 22:24:35 +01:00
Kfir Itzhak ff9a26273c cURL is now working! 2013-12-27 18:02:32 +02:00
Kfir Itzhak bf708a8373 Merge branch 'master' into curl 
Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
	src/zm_camera.h
	src/zm_monitor.cpp
	web/skins/classic/views/console.php
	web/skins/classic/views/monitor.php
 2013-12-27 14:21:12 +02:00
Scott Robinson f2d9deaed6 Update test.monitor.sql 
testing travis build
 2013-12-24 11:07:27 +00:00
Andrew Bauer 6d093c0407 Merge pull request #276 from knnniggett/foreign 
Disables non-POSIX warning when using gnu wildcard
 2013-12-23 14:49:19 -08:00
Edward Barnard 3321506b45 Working libvlc camera implementation. 2013-12-19 21:51:39 +00:00
Andy Bauer 283091a88e Disables non-POSIX warning when using gnu wildcard 2013-12-19 14:10:22 -06:00
Isaac Connor 433370c9e3 Merge branch 'master' into storageareas 
Conflicts:
	distros/ubuntu1204/changelog
	src/zm_monitor.h
 2013-12-15 15:16:14 -05:00
Andrew Bauer e68fd9db91 Automatically grab all sql scripts in the db subfolder 2013-12-14 09:45:18 -06:00
Andrew Bauer 8265eb98dc Add reference to zm_update-1.26.5.sql in Makefile.am 2013-12-13 18:51:39 -06:00
Kyle Johnson f39f2fab66 Merge pull request #241 from ZoneMinder/alarmrefblendoption 
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
 2013-12-13 10:13:34 -08:00
Isaac Connor 0c18f11764 add inital table definition for Storage 2013-12-13 13:07:18 -05:00
Kfir Itzhak c08e4de42e Added the database update file for 1.26.5 with includes the AlarmRefBlendPerc option 2013-11-07 16:29:02 +02:00
Kfir Itzhak 8e96df7643 Initial work on adding cURL to zoneminder 2013-11-04 16:52:21 +02:00
Kfir Itzhak fd656c55cf Changed default blend percentages and the dropdown list for alarm reference image blend 2013-11-04 12:10:53 +02:00
Kfir Itzhak 9d5ac7ae8c Fix cmake installing wrong files in an out-of-source build 2013-11-04 09:56:40 +02:00
Kfir Itzhak c2bd7c97ec First attempt at enabling out-of-source building for zm with cmake 2013-10-31 18:10:00 +02:00
Andrew Bauer e04cc4d026 Create pkgdatadir in make 2013-10-07 08:28:19 -05:00
Isaac Connor 34f84a4097 Merge branch 'v1.26.4-beta' 2013-10-03 10:14:09 -04:00
mastertheknife 48f11a8064 Add cmake to zoneminder 2013-09-28 12:59:50 +03:00
Kyle Johnson 598e830659 SQL syntax error in travis test monitor 2013-09-27 15:56:06 -04:00
Kyle Johnson 2c64c5d2be SQL syntax error in travis test monitor 2013-09-27 15:43:05 -04:00
Kyle Johnson 70841d32ab Use only the needed fields for the travis test cam 2013-09-27 15:31:07 -04:00
Kyle Johnson de59dd8f10 Proper number of columns 1.26.3 for travis 2013-09-27 14:25:03 -04:00
Kyle Johnson a5e526d788 Assign a monitor ID of 500 to the test monitor for the travis builds 2013-09-27 13:58:47 -04:00
Kyle Johnson 3119ab7672 Added steps to install ZM binaries, insert a monitor and start ZM 2013-09-27 09:47:58 -04:00
Serguei S. Dukachev 67595c1c84 Error correction 
Table "Users":
ERROR 1366 (HY000) at line 523: Incorrect integer value: '' for column 'Id' at row 1

Table "MonitorPresets":
ERROR 1366 (HY000) at line 550: Incorrect integer value: '' for column 'Id' at row 1
...and many others like this

Incorrect 'channel' field type in table "MonitorPresets":
ERROR 1366 (HY000) at line 550: Incorrect integer value: 'simple' for column 'Channel' at row 1
...and many others like this

"DefaultValue" field is very small in table "Config":
ERROR 1406 (22001) at line 743: Data too long for column 'DefaultValue' at row 1

Some 'INSERT INTO MonitorPresets' querys are wrong.

"Message" field is very small in table "Logs":
Can't write log entry 'insert into Logs ( TimeKey, Component, Pid, Level, Code, Message, File, Line ) values ( 1379059494.570980, 'web_php', 30387, -3, 'FAT', 'SQL-ERR \'Incorrect decimal value: \'\' for column \'MaxFPS\' at row 1\', statement was \'insert into Monitors set LinkedMonitors = \'\', Name = \'test\', Type = \'Remote\', Function = \'Monitor\', Enabled = \'1\', RefBlendPerc = \'12\', MaxFPS = \'\', AlarmMaxFPS = \'\', Device = \'/dev/video0\', Channel = \'0\', Format = \'255\', Palette = \'0\', LabelFormat = \'%N - %d/%m/%y %H:%M:%S\', LabelX = \'0\', LabelY = \'0\', ImageBufferCount = \'50\', WarmupCount = \'25\', PreEventCount = \'25\', PostEventCount = \'25\', StreamReplayBuffer = \'1000\', AlarmFrameCount = \'1\', EventPrefix = \'Event-\', SectionLength = \'600\', FrameSkip = \'0\', FPSReportInterval = \'1000\', DefaultView = \'Events\', DefaultRate = \'100\', DefaultScale = \'100\', WebColour = \'red\', SignalCheckColour = \'#0000c0\', Protocol = \'http\', Method = \'simple\', Host = \'192.168.3.225\', Port = \'80\', Path = \'\', Colours = \'3\', Width = \'320\', Height = \'240\', Orientation = \'0\', Deinterlacing = \'0\', Sequence = 1\'', 'includes/database.php', 78 )': Data too long for column 'Message' at row 1
 2013-09-13 01:34:00 -07: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
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 d4179035de Modify zmupdate for 1.26.1 and 1.26.2 releases 2013-09-07 15:08:09 -05:00
Isaac Connor 0a9e63ca2c remove autogenerated files 2013-09-06 14:40:55 -04:00
Kyle Johnson c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04:00
Andy e18c08356e Fixed typo 
line 614 was missing a trailing semicolon
 2013-08-27 18:35:27 -05:00
Knniggett bac2d89a8d Add PTZ control files and camera presets for specific ptz cameras 2013-08-25 18:52:09 -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 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
nagyrobi 205c297196 Update zm_create.sql.in 
On a fresh ZoneMinder install, there's a default zone preset active which works pretty well.

If the user goes to the zone settings and plays around with the selectable presets, he looses the default setting forever, if didn't take notes by hand on a piece of paper.

This commit simply adds to the top of the presets list the default value which comes with the original fresh install.
 2013-08-15 17:12:09 +02:00
Kyle Johnson 0a79e4a975 1.26 Beta did not install SkyIPCam7xx.pm Control Script. Fixes #38 2013-08-15 09:08:51 -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
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 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
Isaac Connor 3a8481a591 cleanup 2013-05-10 14:02:22 -04:00
Isaac Connor a468baf9eb cleanup 2013-05-10 13:55:45 -04:00
Isaac Connor 9d89fb3bcb Merge branch 'kfir-proper' into develop 2013-05-10 12:23:58 -04:00
Isaac Connor 0da26d4f75 add a Controls preset for Airlink SkyIPCam 7xx cameras 2013-05-09 09:14:01 -04:00
Isaac Connor 7cf5475542 Merge ../ZoneMinder-kfir into kfir-proper 
Conflicts:
	configure
	src/Makefile.am
	src/Makefile.in
 2013-05-02 21:28:51 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00
Kfir Itzhak ed2e3a8ce0 Fixed few compiler errors (unknown registers and such) and modified zm_create.sql to include the new field. 2012-07-17 10:36:21 +03:00
stan 4996dd0a51 Recreated generated files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:46:18 +00:00
Kfir Itzhak eeaed7ccd3 Some small changes 
1) Fixed wrong size calculation in Image::AssignDirect.
2) Improved libjpeg subpixel order selection.
3) Finished adding support in the simple Overlay function.
4) Completed Flip and Rotate 32bit RGB support.
5) Allow ZM to compile on 32bit with omit frame pointer disabled by defining _DEBUG
   To use one less register in the SSE algorithms.
6) Removed the counter variable in some loops to reduce loop overhead.
7) Modified crop query error handling.
8) Most of the shared data now declared as volatile.
9) Small improvements to the AlarmedPixels motion detection.
10) Changed the default blend percent from 7% to 12%.
11) Fixed an earlier bug created by me: motion detection checking the wrong pixels.
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 4a59761bcc Getting closer and closer everyday. 
1) Fixed many errors to get it to compile
2) Fixed some small bugs
3) Small other changes
 2012-02-01 07:33:20 +02:00
Kfir Itzhak 5c418133bf Lots accomplished! 
1) Delta and blend SSE and standard alogirthms inside
2) Changed event streaming to use sendfile() syscall if available
3) Direct memory capture (Less memcpys required)
4) Added macros for BGR24 and RGB32(and its variants) formats
5) Modified Monitors database table to add a target colorspace option
6) Changed most image buffer allocations to be on 16 byte boundary, work still in progress
7) Added Target colorspace instead of the old colours selection. this one also visible to local cameras
8) Replacing Y deltas option with ZM_CPU_EXTENSIONS
9) Added SSE detection code
10) Changed some code to make linking success with inlining enabled.
11) Some other changes and work still in progress for some listed above
 2012-02-01 07:33:20 +02:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan 2ab2631ef1 Regenerated 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3363 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-25 09:14:53 +00:00
stan 58c77d2b40 Updates for version 1.24.4 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3358 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 16:19:12 +00:00
stan 7b43ac2645 Use JSON encoding for language independent serialisation (filters and control commands) rather than PHP serialisation. Removes dependency on rare PHP::Serialization perl module. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3357 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 16:18:18 +00:00
stan 8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 21:59:06 +00:00
stan cffcd39802 Added ffmpeg monitor presets 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3227 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-17 18:21:27 +00:00
stan 46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-07 11:10:18 +00:00
stan dc9e2755b0 Added sample apache config file. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-03 23:27:58 +00:00
stagecoach a6cded083d Updated zm_create.sql.in: 
Path field in Monitors table was 64, should be 255 like in MonitorPresets table. Modified length of Path field in Monitors table from 64 to 255.
SubPath field in Monitors table was 255, should be 64, like in MonitorPresets table. Modified length of SubPath field in Monitors table from 255 to 64.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3204 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-24 00:17:11 +00:00
jaidhar 069136fe53 Added vlog function to view log output, ability to redirect XML logging to it's own file 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3201 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:09:18 +00:00
jaidhar c7b3d04eed Got rid of MJPEG code choice for viewing events, only MPEG-4 and H264 now. Added default bitrate for event viewing to config XML 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3199 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:08:33 +00:00
jaidhar e57c1b0331 XML Plugin: More config options added, stability fixes to H264 streaming 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3192 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-12 23:04:09 +00:00
jaidhar 78caa0adb0 XML Plugin: Added more XML Options along with H264 options. These will be disabled unless client ver >=1.2. Added ability to track client version in PHP 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3191 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-12 04:26:31 +00:00
jaidhar 2d7979ac93 XML Plugin: Moved key XML Plugin options to database and updated ConfigAdmin/options.php to show XML Tab (new category 'XML' created). More H264 streaming updates 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3186 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 05:25:43 +00:00
stan 825eda95a6 Regenerated 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3162 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 15:56:23 +00:00
stan d22356d495 Versions updated 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3039 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-28 19:15:35 +00:00
stan a32d9e5fbc Updated Makefiles 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2979 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-14 17:49:26 +00:00
stan 72d4f11213 Added preset for remote ZM sources 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2974 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-14 09:42:46 +00:00
stan e91148585a Default check colour for signal loss was wrong, now corrected. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2973 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-14 09:41:39 +00:00
stan 8cad0dbd6a Updated. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-24 10:27:28 +00:00
stan 11a1cc2d41 Now supports custom perl install path 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-08 09:11:56 +00:00
stan 0a6c56cd2f Added reload combozola config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2891 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-25 18:07:51 +00:00
stan 93d1cf8ed2 Updated makefiles 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2835 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-31 14:10:04 +00:00
stan 6efad7b23c Moved BTTV presets to end of list 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2832 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-31 13:11:45 +00:00
stan ddafd7bc7d Updated with new Local presets 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2831 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-31 13:10:28 +00:00
stan 3310ea3ae9 Added V4L version to presets and generic PAL/NTSC standards 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2823 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-30 12:00:14 +00:00
stan 75c654e654 Downgraded to support autoconf 2.59 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-23 21:59:13 +00:00
stan 92037fa058 Removed zm_data 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2807 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-20 11:30:56 +00:00
stan 3069dc2402 Final timestamp update 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-09 12:45:32 +00:00
stan 429884741a Updated for timestamps 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2801 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-09 12:32:04 +00:00
stan a2b387582d Added to SVN. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2790 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-24 15:56:25 +00:00
stan a018876744 Updated to version 1.24.1 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2788 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-23 20:54:36 +00:00
stan 61089eeeb1 Added authentication hashed logins. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2781 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-19 14:06:39 +00:00
stan 3a86651627 Reworked multi-buffering etc for V4L multi-sources. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2775 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-17 21:23:27 +00:00
stan e14efbd493 Updated generated files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2726 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-28 11:24:01 +00:00
stan 25dc98a39f Added ability to specify MySQL DB engine type. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2725 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-28 11:23:50 +00:00
stan 21d8d74a28 V4L2 updates 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2723 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-27 11:07:24 +00:00
stan 69662d644a Fixed missing DB table changes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2722 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-23 15:35:41 +00:00
stan e39b2fd16e Adeed ffmpeg monitor type. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2719 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-21 17:42:21 +00:00
stan d43d2289ed Changes from updated build tools. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2714 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-20 14:54:50 +00:00
stan 549aa39cbb Updated autoconf/make files 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2710 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-06 00:05:56 +00:00
stan 7d96edeacd Added .in files to svn 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2681 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-11-03 12:14:50 +00:00
stan 14e037d6fb Fixed broken local camera presets. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2643 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-30 15:39:54 +00:00
stan 435c469d4b Added DUMP_CORES option. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2639 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-29 11:43:43 +00:00
stan 43a1802b90 Fixed issue with updating Config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2638 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-29 11:43:30 +00:00
stan 7e26b15eb5 Updated for event close mode mods. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2633 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-26 09:48:03 +00:00
stan 6fcab609c1 Fixed issue with MonitorPreset column mismatch 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2598 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-24 15:36:35 +00:00
stan c4c376a656 Updated for new colour values for non-Local monitor. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2584 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-21 15:23:01 +00:00
stan ebc4003f44 Updated for new palette definitions and v4l2 method 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2580 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-21 14:47:08 +00:00
stan 9137a61831 Remove LearnState from Events table 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2531 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-16 08:32:22 +00:00
stan b83c3a46d2 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2530 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-16 08:29:34 +00:00
stan 55fb3418ac Updated with config 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2524 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-15 09:05:40 +00:00
stan b2f616ff21 Merged in mmap changes. Revision 2323:2515 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2516 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-14 15:21:16 +00:00
stan d7818cd913 Remove learn state bit. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2511 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-14 14:42:51 +00:00
stan 2824cb7355 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-14 13:54:50 +00:00
stan 132772f5d3 Updated for version 1.23.3 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2358 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-03-13 13:44:52 +00:00
stan 72c8bd107c But 468 - Fixed format of PurgeWhenFull filter. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2340 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-03-10 09:33:51 +00:00
stan c411eaf614 Bug 466 - Change old format PwF filters. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2320 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-24 19:03:39 +00:00
stan 5c3cefa09f Bug 466 - PurgeWhenFull filter now in correct format 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2319 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-24 18:58:15 +00:00
stan bbacc97d8d Bug 464 - Fixed bogus PxF filter, and added to CVS. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2315 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-24 18:03:10 +00:00
stan 0c8b6320bc Updated config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2311 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-13 23:47:25 +00:00
stan 630f74b5ce Bug 454 - Ensure that the correct version is stored in the DB so upgrades can be automatic. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2308 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-13 23:01:07 +00:00
stan ac8f2decc8 Updated for 1.23.2 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2297 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-10 22:25:00 +00:00
stan 86aaa5450e Bug 452, 453 - Added support for Veo Observer and Blue Net Video Server in presets. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2295 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-10 22:16:48 +00:00
stan 9ba8110799 Set delete flag on PurgeWhenFull filter. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2285 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-01-13 18:17:32 +00:00
stan 9e13cae829 Bug 438 - Fixed various PTZ protocol and control issues. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2281 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-01-08 12:33:11 +00:00
stan 26ef345300 Added db update file for 1.23.1 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2280 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-01-04 09:44:43 +00:00
stan f0eb05362e Bug 427 - Updated with aspect ratio config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2272 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-12-29 18:48:39 +00:00
stan bdeeb7f2e4 Fixed missing comma in schema 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2268 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-12-28 12:46:41 +00:00
stan 634c6ed88e Removed trailing commas on primary keys 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2267 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-12-24 12:40:24 +00:00
stan 412d28690e Bug 417 - Removed Frames id index, not used. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2254 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-12-09 16:27:34 +00:00
stan 3c842cf7df Bug 417 - Optimised Events indicies 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2252 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-12-09 13:44:47 +00:00
stan 0a1291a762 Removed redundant indices. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2250 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-12-08 18:37:58 +00:00
stan e291095f0e Corrected default label format. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2242 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-11-18 13:06:32 +00:00
stan 102ec8b439 Fixed missing backquote. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2224 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-20 09:32:34 +00:00
stan 4198f02114 Updated. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2220 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-18 14:40:44 +00:00
stan a9dd4c7ad0 Updated docs and changed version to 1.23.0 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2216 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-18 14:15:29 +00:00
stan 215184e4cb Bug 345 - Added alarm jpeg file quality setting. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2209 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-18 10:58:03 +00:00
stan 3427dfddd2 Bug 42 - Users can now change their own passwords. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2204 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-17 15:49:08 +00:00
stan 6932898d40 Bug 390 - Changed timestamp tokens. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2194 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-05 16:31:42 +00:00
stan 8d905aac99 Bug 400 - Made signal check colour monitor specific. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2193 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-05 15:05:28 +00:00
stan 07a9f1fa1c Bug 228 - Added deep storage option. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2190 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-04 16:08:55 +00:00
stan a6f42efe28 Moved control protocol updates into correct update script. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2182 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-08-30 12:08:14 +00:00
stan bd558af08f Bug 414 - Changed PTZ control functions to use libraries and sockets 
rather than scripts.


git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2180 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-08-30 10:43:06 +00:00
stan 50cc4d980f Bug 411 - Merged in DVR functionality. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2175 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-08-29 18:11:09 +00:00
stan 2c09dbeeb9 Bug 410 - Added in detection suspension if motion overloaded. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2132 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-06-05 14:12:14 +00:00
stan 338a2d9fa3 Added update script for 1.22.3 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2099 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-04-03 09:59:59 +00:00
stan 91fbdb8329 Increased size of Definition column in run states. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2098 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-04-03 09:59:01 +00:00
stan e180ded0e2 Fixed up inconsistencies in db. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2078 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-17 11:40:26 +00:00