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

178 Commits

Author SHA1 Message Date
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
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