Commit Graph

493 Commits

Author SHA1 Message Date
Isaac Connor 10732f039d update to 1.31.0 2017-04-21 12:45:44 -04:00
Isaac Connor 8280f79c32 set default on DefaultVideo 2017-02-16 13:29:19 -05:00
Isaac Connor ef653b97d7 set default on DefaultVideo 2017-02-16 13:28:50 -05:00
Isaac Connor a95fea4bef change default Storage location to /var/cache/zoneminder/events 2017-02-14 11:29:20 -05:00
Isaac Connor 89022fff0c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-01-30 21:16:26 -05:00
Isaac Connor 85727dbe2b bump version and set Path to allow NULLS 2017-01-30 17:25:07 -05:00
Isaac Connor 7ab6818fa0 Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize 2017-01-25 17:14:30 -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 2829b146d5 drop the not null from EncoderParameters 2017-01-23 10:30:46 -05:00
Isaac Connor ff1b369a99 add in the required updated file 2017-01-17 12:10:00 -05:00
Isaac Connor 899b1b82b9 Merge branch 'filter_by_runstate' into storageareas 2017-01-14 17:07:20 -05:00
Isaac Connor 8d02607a90 add an update script to add StateId to Events table 2017-01-14 16:58:22 -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 2a1ec2beb1 Merge pull request #1719 from knnniggett/hikvisionptz
Add HikVision ptz control sciprt
2017-01-03 08:59:56 -05:00
Isaac Connor b52e826773 add update file to change MonitorIds from tinytext to text 2017-01-02 13:03:42 -05:00
Isaac Connor 649b801e91 change type of MonitorIds from tinytext to text 2017-01-02 13:03:37 -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