Isaac Connor
a95fea4bef
change default Storage location to /var/cache/zoneminder/events
2017-02-14 11:29:20 -05:00
Isaac Connor
85727dbe2b
bump version and set Path to allow NULLS
2017-01-30 17:25:07 -05:00
Andrew Bauer
af728388d0
Merge pull request #1734 from connortechnology/fix_1720
...
Fix 1720
2017-01-23 20:35:10 -06:00
Isaac Connor
899b1b82b9
Merge branch 'filter_by_runstate' into storageareas
2017-01-14 17:07:20 -05:00
Isaac Connor
242e5a56d8
rough in the ability to filter on RunState
2017-01-14 16:55:28 -05:00
Isaac Connor
3074263e06
Merge branch 'control_fixes' into storageareas
2017-01-10 12:54:46 -05:00
Stefan Lindblom
fa416ef889
Add MonitorPreset for Qihan IP cameras via RTSP
2017-01-10 12:02:47 +01:00
Isaac Connor
649b801e91
change type of MonitorIds from tinytext to text
2017-01-02 13:03:37 -05:00
Andy Bauer
4be668f838
Add HikVision ptz control sciprt
2016-11-06 08:03:43 -06:00
Isaac Connor
ea27e07276
add indexes for Monitors(ServerId) and Servers(Name)
2016-10-20 13:19:41 -04:00
Isaac Connor
1862611b94
add Orientation to Events table
2016-10-12 09:11:50 -04:00
Jon Gerdes
ee720c4561
Control script for Keekoon cameras. Tested with KK002.
2016-07-25 11:20:49 +01:00
Isaac Connor
bc0b499697
update zm_create.sql.in to match the update scripts
2016-09-20 14:10:37 -04:00
Isaac Connor
85b2ba73ab
change the behaviour of StorageID. Now it will NOT NULL default 0 and a value of 0 means use ZM_EVENTS_PATH
2016-09-14 09:31:57 -04:00
Isaac Connor
2451768295
Merge branch 'master' into storageareas
2016-08-08 18:08:46 -04:00
Isaac Connor
71f2ac423d
Add NULL For Id column in Filters when adding PurgeWhenFull
2016-06-22 09:44:14 -04:00
Isaac Connor
ea87d9a305
fix merge problem
2016-06-14 21:16:38 -04:00
Isaac Connor
f86c7735e3
Merge branch 'filter_id' into storageareas
2016-05-30 10:28:40 -04:00
Isaac Connor
06e14c63c2
Add Id column as Primary key to Filters
2016-05-30 10:25:30 -04:00
Isaac Connor
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
Isaac Connor
238a25a302
Merge branch 'master' into iconnor_video
2016-04-05 09:38:59 -04:00
Isaac Connor
ed74168710
increase the size of the Pid field in Logs to accomodate FreeBSD
2016-04-04 15:14:14 -04:00
Isaac Connor
b3fed1767b
Add Concurrent value to the PurgeWhenFull Filter. Default to false
2016-04-04 11:57:11 -04:00
Isaac Connor
2a892c5b9a
Merge branch 'iconnor_video' into storageareas
2016-03-31 15:34:52 -04:00
Isaac Connor
742fab2ea4
Add db updates for Video and recordAudio
2016-03-31 15:32:24 -04:00
Isaac Connor
86c223668d
Merge branch 'master' into storageareas
2016-02-25 19:11:38 -05:00
Andy Bauer
7a42a8c3f9
add Netcat ONVIF compatible ptz control
2016-02-24 10:15:59 -06:00
Isaac Connor
b7256a6891
Merge branch 'master' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
version
2016-02-10 09:17:40 -05:00
Andy Bauer
b718bd298f
Merge branch 'vivotek-ePTZ' of https://github.com/schrorg/ZoneMinder into schrorg-vivotek-ePTZ
2016-02-09 06:56:38 -06:00
Isaac Connor
47c2023441
Add Concurrent to Filters
2016-02-05 11:23:45 -05:00
Isaac Connor
1837cc89ea
Merge branch 'schrorg-vivotek-ePTZ' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
version
2016-02-04 12:24:07 -05:00
Isaac Connor
89cff287cd
Merge branch 'master' into storageareas
2016-02-04 12:14:16 -05:00
Isaac Connor
d65c9d797b
fix merge, update to 1.30.1
2016-02-04 12:13:48 -05:00
Isaac Connor
9ace6c518d
Merge pull request #1225 from Simpler1/profiles
...
Added profiles for Wanscam-HW0025 and IPCC-7210W
2016-02-04 11:55:48 -05:00
Isaac Connor
ddf7b1ad43
Merge branch 'master' into storageareas
...
Conflicts:
web/skins/classic/js/dark.js
web/skins/classic/js/flat.js
2016-01-14 09:41:24 -05:00
Isaac Connor
47d4331d62
Add Hostname Column to create script, to match update
2016-01-10 20:58:45 -05:00
Simpler1
0d5d43251f
Added lines to db/zm_create.sql.in for two cameras
2016-01-04 15:51:11 -05:00
Isaac Connor
93dbc3f0c1
Merge multi-server updates and bump version
2016-01-01 16:31:02 -05:00
Isaac Connor
8e25b80252
bump version due to db change adding ServerId to Logs
2015-12-31 10:14:20 -05:00
SteveGilvarry
eb2829a680
Remove comma preventing db create script running
2015-12-29 00:04:17 +11:00
Isaac Connor
a196906345
Move where StorageId goes to after ServerId
2015-12-15 09:12:11 -05:00
Isaac Connor
b2b1afa8ad
Merge master
2015-12-14 15:49:32 -05:00
Robin Daermann
1f1b48ed51
Added Vivotek ePTZ control to zm_create.sql
2015-11-04 19:17:47 +01:00
Kyle Johnson
e51ff0677f
Fix typo in Frames index creation. I hope
2015-10-22 12:12:56 -06:00
Kyle Johnson
746e695448
Add index to Frames table upon new creation
2015-10-22 11:25:32 -06:00
Andrew Bauer
8d2de77f18
Merge pull request #1079 from bofhdk/SunEyes_sp-p1802swptz
...
Added control script for SunEyes SP-P1802SWPTZ
2015-09-30 07:35:44 -05:00
Bobby Billingsley
ef5d62a6c2
typo fixed
2015-09-30 14:10:13 +02:00
Bobby Billingsley
a335afb554
added missing MonitorPresets values
2015-09-30 13:59:41 +02:00
Bobby Billingsley
6fe69f3d28
added missing Controls values
2015-09-30 13:55:14 +02:00
Kyle Johnson
679a663861
Change Frame to have a PrimaryKey called ID
2015-09-29 14:30:54 -06:00
Andy Bauer
395e628541
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-29 07:57:18 -05:00
Isaac Connor
1cf54d2e38
Merge pull request #1026 from schrorg/blacken-zones
...
Add new zone type - privacy zones
2015-08-27 09:14:16 -04:00
Isaac Connor
6093587ff2
Merge pull request #1039 from pliablepixels/1038-fixing-state-mgmt-1030-isActive-fix
...
1038 fixing state mgmt 1030 is active fix
2015-08-27 09:08:50 -04:00
Pliable Pixels
82fe6c8f0e
States table now uses a unique Name column
2015-08-26 11:19:58 -04:00
Andrew Bauer
f5f7363d35
add RTSPDescribe column to Monitors table
2015-08-21 10:32:04 -05:00
Robin Daermann
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
Robin Daermann
fbcd6f365b
Change database schema (add 'Blacken' zone type) and bump version to 1.28.105
2015-08-20 16:17:08 +02:00
Andrew Bauer
fe3595bfa1
Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_update-1.28.101.sql
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 20:20:53 -05:00
Andrew Bauer
68adcc9e67
Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 14:07:38 -05:00
Linwood-F
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
Robin Daermann
55eee8d6a4
Added SQL changes to zm_create.sql.in
...
Bumped version to 1.28.103 as requested
2015-08-17 15:05:17 +02:00
Andrew Bauer
3489d0d734
add Exif column to sql database
2015-08-16 17:43:45 -05:00
Andrew Bauer
36c7d7f9c2
Add Group Edit permission to the default admin account
2015-08-15 14:58:41 -05:00
Andrew Bauer
936aa00a5e
add sql bits
2015-08-15 12:00:48 -05:00
Emmanuel Papin
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
Emmanuel Papin
d2a3655d51
Fix a typo error in db/zm_create.sql.in
2015-07-22 22:15:34 +02:00
Emmanuel Papin
d0d72672a7
Fix sql files
2015-07-22 21:49:06 +02:00
Emmanuel Papin
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
Emmanuel Papin
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
Isaac Connor
ace8597b8d
Merge branch 'master' into multi-server
2015-07-14 16:10:51 -04:00
Isaac Connor
6d33da6245
Add ServerId to Monitors
2015-07-02 14:17:49 -04:00
Andy Bauer
1aebbec4e8
Merge branch '898-isRunning-States' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-898-isRunning-States
...
Conflicts:
db/zm_create.sql.in
db/zm_update-1.28.99.sql
2015-06-27 16:32:32 -05:00
Isaac Connor
09b052010e
remove extra comma
2015-06-26 10:57:44 -04:00
Isaac Connor
2fba839e8b
Add Servers Table and add Id PRIMARY KEY to States
2015-06-26 10:17:07 -04:00
Pliable Pixels
d2472f177d
Added isRunning column
2015-06-21 09:30:14 -04:00
Pliable Pixels
67f1914e26
Added definition for Foscam FI8918W
2015-06-19 15:48:03 -04:00
Pliable Pixels
35e8a9d89b
Added 9831W to PTZ protocol DB
2015-06-19 13:06:00 -04: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
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
Andrew Bauer
254dffa633
Move ONVIF control script & add dB entry
2014-08-03 15:52:59 -05: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
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
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
Isaac Connor
0cd3e33fb1
add db inserts to add WanscamPT controls
2014-03-19 12:20:19 -04: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
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
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
Edward Barnard
3321506b45
Working libvlc camera implementation.
2013-12-19 21:51:39 +00: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
Isaac Connor
0c18f11764
add inital table definition for Storage
2013-12-13 13:07:18 -05: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
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
e18c08356e
Fixed typo
...
line 614 was missing a trailing semicolon
2013-08-27 18:35:27 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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