c828a3df33
typo
2015-08-15 12:13:35 -05:00
936aa00a5e
add sql bits
2015-08-15 12:00:48 -05:00
7f3a07f21b
Add label size to monitor options (database and backend part)
...
This commit bumps version to 1.28.101 because of database schema change
2015-08-10 15:35:18 +02:00
2ccb378e2d
Fix a typo error in sql file
2015-07-24 00:25:57 +02:00
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
d2a3655d51
Fix a typo error in db/zm_create.sql.in
2015-07-22 22:15:34 +02:00
d0d72672a7
Fix sql files
2015-07-22 21:49:06 +02:00
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
ace8597b8d
Merge branch 'master' into multi-server
2015-07-14 16:10:51 -04:00
bd84830433
fix comment
2015-07-14 16:10:09 -04:00
2819585cdb
move add ServerId to Monitors to zm_update-1.28.100.sql
2015-07-14 16:09:01 -04:00
bc0090f6f7
fix PRIMARY KEY update on States
2015-07-07 15:46:44 -04:00
1328ba456a
fix drop primary key line.
2015-07-07 09:43:56 -04:00
6d33da6245
Add ServerId to Monitors
2015-07-02 14:17:49 -04:00
a738011c04
Update zm_update-1.28.99.sql
...
typo
2015-06-30 10:33:09 -05:00
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
09b052010e
remove extra comma
2015-06-26 10:57:44 -04:00
2fba839e8b
Add Servers Table and add Id PRIMARY KEY to States
2015-06-26 10:17:07 -04:00
754091b55d
Added isRunning column
2015-06-21 09:30:23 -04:00
d2472f177d
Added isRunning column
2015-06-21 09:30:14 -04:00
b41538fe65
Added definition for Foscam FI8918W
2015-06-19 15:51:07 -04:00
67f1914e26
Added definition for Foscam FI8918W
2015-06-19 15:48:03 -04:00
be4a434dbd
Added 9831W to update script
2015-06-19 13:57:19 -04:00
35e8a9d89b
Added 9831W to PTZ protocol DB
2015-06-19 13:06:00 -04:00
30765fdedf
hide USE_DEEP_STORAGE
2015-04-12 12:20:20 -05:00
e17bad3061
add onvif ptz control into update script
2015-02-21 11:33:49 -06:00
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
c3ecaa4e67
Corrected default value for column 'ConfigType'
2014-12-14 11:49:10 +01:00
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
4a39b3215b
New monitor function 'Extdect'
2014-12-05 09:29:57 +01:00
fc28fee7ef
add the db updates for the V4L changes
2014-11-14 17:20:57 +01:00
c80bf07ea7
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-11-14 17:17:09 +01:00
5c6fe54265
Persistance and UI for ONVIF monitor options
2014-11-14 17:17:09 +01:00
d290af2c9f
Move ONVIF control script & add dB entry
2014-11-14 17:11:22 +01:00
af57c177d7
Update zm_create.sql.in
...
Add Control 3S N5071 Dome Ptz Camera
2014-11-12 08:47:35 -03:00
85529efffc
check for existence of the columns beefore trying to add them
2014-10-22 10:31:23 -04:00
71b56a163d
Zoneminder 1.28.0 Release
2014-10-18 15:23:13 -05:00
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
d1b1c35e48
these fields need to be able to be nul
2014-09-08 17:10:49 -04:00
2b4fb7af26
drop not nuls from new V4L fields
2014-08-27 09:42:06 -04:00
254dffa633
Move ONVIF control script & add dB entry
2014-08-03 15:52:59 -05:00
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
0d229182f7
add the db updates for the V4L changes
2014-07-24 14:38:51 -04:00
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
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
90b06060af
fix missing ExtendAlarmFrames column when add Default ZonePreset
2014-06-26 11:17:09 -04:00
b48d06b279
change commands to handle if db already has the User and Pass fields
2014-06-13 16:09:01 -04:00
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
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
79a13cf750
adjust inserts to ZonePresets
2014-05-08 03:49:48 +02:00
aae6dbed13
Add new colums to zm_create.sql.in
2014-05-08 02:53:44 +02:00
a6a9d9f270
add Options field to zm_create.sql.in
2014-05-08 02:30:54 +02:00
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
9fb794f4d0
add option field zo monitors
2014-04-25 13:23:06 +02:00
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
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
da8ac0726d
make db update safe to run multiple times
2014-03-20 22:02:58 +01:00
9ce51755ff
add ExtendAlarmFrames Fields to Zones and ZonePresets
2014-03-20 10:26:48 +01:00
0cd3e33fb1
add db inserts to add WanscamPT controls
2014-03-19 12:20:19 -04:00
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
e8be3cb571
Merge remote branch 'nagyrobi/patch-8' into nagyrobi
2014-02-26 07:57:42 -06:00
c3200dfec7
Update zm_create.sql.in
...
Enable delete filter by default. Increase limit to 100 events.
2014-02-20 14:10:54 -06:00
563c526d98
Update zm_update-1.27.0.sql
2014-02-01 12:56:18 -06:00
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
ed40ee4d11
Update zm_create.sql.in
...
Fix typo created during a manual merge
2014-01-17 09:54:37 -06:00
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
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
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
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
05e395613b
Adding PTZ module for Toshiba IK-WB11A
2014-01-14 00:58:12 -08:00
9901ce9e84
Merge remote branch 'origin/master' into curl
2014-01-05 10:16:01 +02:00
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
b3af313370
Merge pull request #282 from scottgrobinson/master
...
Add zmMontageScale so montage scale is also 'saved'
2014-01-02 11:18:39 -08:00
2f3934c20e
Merge pull request #289 from dmak/foscam
...
Foscam IP cameras control script
2014-01-01 07:30:46 -08:00
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
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
ff9a26273c
cURL is now working!
2013-12-27 18:02:32 +02:00
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
f2d9deaed6
Update test.monitor.sql
...
testing travis build
2013-12-24 11:07:27 +00:00
6d093c0407
Merge pull request #276 from knnniggett/foreign
...
Disables non-POSIX warning when using gnu wildcard
2013-12-23 14:49:19 -08:00
3321506b45
Working libvlc camera implementation.
2013-12-19 21:51:39 +00:00
283091a88e
Disables non-POSIX warning when using gnu wildcard
2013-12-19 14:10:22 -06:00
e68fd9db91
Automatically grab all sql scripts in the db subfolder
2013-12-14 09:45:18 -06:00
8265eb98dc
Add reference to zm_update-1.26.5.sql in Makefile.am
2013-12-13 18:51:39 -06:00
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
c08e4de42e
Added the database update file for 1.26.5 with includes the AlarmRefBlendPerc option
2013-11-07 16:29:02 +02:00
8e96df7643
Initial work on adding cURL to zoneminder
2013-11-04 16:52:21 +02:00
fd656c55cf
Changed default blend percentages and the dropdown list for alarm reference image blend
2013-11-04 12:10:53 +02:00
9d5ac7ae8c
Fix cmake installing wrong files in an out-of-source build
2013-11-04 09:56:40 +02:00
c2bd7c97ec
First attempt at enabling out-of-source building for zm with cmake
2013-10-31 18:10:00 +02:00
e04cc4d026
Create pkgdatadir in make
2013-10-07 08:28:19 -05:00
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
48f11a8064
Add cmake to zoneminder
2013-09-28 12:59:50 +03:00
598e830659
SQL syntax error in travis test monitor
2013-09-27 15:56:06 -04:00
2c64c5d2be
SQL syntax error in travis test monitor
2013-09-27 15:43:05 -04:00
70841d32ab
Use only the needed fields for the travis test cam
2013-09-27 15:31:07 -04:00
de59dd8f10
Proper number of columns 1.26.3 for travis
2013-09-27 14:25:03 -04:00
a5e526d788
Assign a monitor ID of 500 to the test monitor for the travis builds
2013-09-27 13:58:47 -04:00
3119ab7672
Added steps to install ZM binaries, insert a monitor and start ZM
2013-09-27 09:47:58 -04:00
Andrew Bauer
Robin Daermann
Emmanuel Papin
Isaac Connor
Andrew Bauer
Pliable Pixels
Jan M. Hochstein
jmcastro2014
Kfir Itzhak
m-bene
Sune1337
tim
Isaac Connor
Dmitry Katsubo
Scott Robinson
Edward Barnard
Andy Bauer
Kyle Johnson
Isaac Connor
Kyle Johnson