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

478 Commits

Author SHA1 Message Date
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 2a1ec2beb1 Merge pull request #1719 from knnniggett/hikvisionptz 
Add HikVision ptz control sciprt
 2017-01-03 08:59:56 -05:00
Isaac Connor eb5f0b370e fix type of Config.DefaultValue and add NOT NULL to Message 2016-12-12 22:23:56 -05:00
Isaac Connor 593fbf0022 Merge branch 'message_column_to_text' into storageareas 2016-12-12 21:59:00 -05:00
Isaac Connor e058217a4b add a db update script to update the Messages column to a TEXT type. 2016-12-12 21:55:32 -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 4fc85fd89c add indexes for Monitors(ServerId) and Servers(Name) 2016-10-20 13:18:33 -04:00
Isaac Connor 5a842f34cf fix extra , 2016-10-12 16:17:43 -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
Andy Bauer 6950e3385a bump project to 1.30.0 2016-05-31 19:41:17 -05:00
Isaac Connor f0a9820096 need to convert NULL values before saying not null 2016-09-20 17:53:35 -04:00
Isaac Connor bc0b499697 update zm_create.sql.in to match the update scripts 2016-09-20 14:10:37 -04:00
Isaac Connor 18ae1298c4 need this update that converts StorageId to NOT NULL default 0 2016-09-16 09:00:34 -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 6994a76488 cleanup, update version #'s on db update scripts that need to move because we released 1.30 2016-08-30 12:27:45 -04:00
Isaac Connor 714c551359 Add some more fields relating to ptz controls that should be able to be NULL 2016-08-17 09:39:55 -04:00
Isaac Connor 2451768295 Merge branch 'master' into storageareas 2016-08-08 18:08:46 -04:00
Isaac Connor a089f11014 add more NULL columns 2016-07-19 17:17:11 -04:00
Isaac Connor be1083e007 add more fields that can be NULL 2016-07-14 10:28:00 -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 c3d3514e51 fix update script to add Id column to Filters 2016-06-15 11:35:11 -04:00
Isaac Connor ea87d9a305 fix merge problem 2016-06-14 21:16:38 -04:00
Isaac Connor b8c406f969 Merge branch 'master' into storageareas 2016-06-03 09:32:55 -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 654d4d2bee Merge branch 'api_fixes' into storageareas 2016-05-07 10:56:47 -04:00
Isaac Connor e101aed2d5 Remove IGNORE keyword, it is invalid 2016-05-05 15:10:30 -04:00
Isaac Connor e1cbaed2a3 Merge branch 'icon_video' into storageareas 2016-04-06 12:50:46 -04:00
Isaac Connor 709fc35167 Merge branch 'master' into icon_video 2016-04-06 11:49:40 -04:00
Isaac Connor 9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -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
Andy Bauer 4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
Isaac Connor 397eb1a01b increase the size of the Pid field in Logs to accomodate FreeBSD 2016-04-04 15:14:42 -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
SteveGilvarry 5ff427d9e9 Removed Autotools Makefile.am 
Conflicts:
	Makefile.am
	misc/Makefile.am
	src/Makefile.am
	web/includes/Makefile.am
	web/js/Makefile.am
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
 2016-02-26 22:19:02 +11: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 5fbeb474a8 Merge branch 'schrorg-vivotek-ePTZ' into storageareas 2016-02-04 12:25:51 -05:00
Isaac Connor a442ef3be8 move the content from 1.28.109 into 1.30.1 2016-02-04 12:25:16 -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