Isaac Connor
1328ba456a
fix drop primary key line.
2015-07-07 09:43:56 -04:00
Andrew Bauer
a738011c04
Update zm_update-1.28.99.sql
...
typo
2015-06-30 10:33:09 -05: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
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
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