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

840 Commits

Author SHA1 Message Date
Isaac Connor 37a40a30d3 drop archived and Frames indexes from Events, as they are useless. Add a StorageId Index 2018-01-05 14:39:54 -05:00
Isaac Connor b7ad24a266 revert the triggers to update Monitor Stats. THey just don't work 2018-01-04 17:22:51 -05:00
Isaac Connor db0e35bf55 Move eventcounts update from zmwatch.pl to triggers and zmaudit.pl 2018-01-04 15:04:13 -05:00
Isaac Connor 4033cf5ffc bump version to 1.31.19 with triggers 2018-01-04 13:07:02 -05:00
Isaac Connor 6c07347721 Fix Update DiskSpace Filter adding 2018-01-01 13:19:16 -05:00
Isaac Connor edd5bd8874 create the Update DIskSpace filter if it doesn't exist 2018-01-01 12:44:09 -05:00
Isaac Connor a79017b168 add a KEY to Events for EndTime and DiskSpace, since we are constantly selecting on those. Insert the Update DiskSpace filter on db creation. 2018-01-01 12:43:47 -05:00
Isaac Connor 0c350b8f41 add ServerId to Storage 2017-12-22 11:38:59 -08:00
Isaac Connor 2c1aa2a92f missing ; 2017-12-20 21:22:37 -05:00
Isaac Connor 0e2d2ce611 fix typos 2017-12-18 13:05:04 -05:00
Isaac Connor d312482a2b add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE 2017-12-18 12:52:26 -05:00
Isaac Connor 833ae0ee8f alter the type of the Channel field to match the update that occurred in 1.23.3 2017-12-11 15:09:41 -05:00
Isaac Connor dd69bc3d7b Merge branch 'master' into storageareas 2017-12-11 11:39:42 -05:00
Andy Bauer a2d266f8f9 fix floreen ptz control sql 2017-12-09 16:05:42 -06:00
Isaac Connor a867c488e0 ned to actually remove the MonitorIds column 2017-12-09 14:05:18 -05:00
Isaac Connor e46f75c130 fix db update 2017-12-05 15:22:15 -08:00
Isaac Connor 4f40b0464c Don't remove MonitorIds column.. just to support downgrading 2017-12-04 17:11:16 -05:00
Isaac Connor 1f2f708287 Handle empty strings in MonitorsIds 2017-12-04 17:00:52 -05:00
Isaac Connor 6270408c8f rework group MonitorIds and add GroupId filters to api 2017-12-04 15:52:16 -05:00
Isaac Connor af1729792f add AutoMove and AutoMoveTo to Filters 2017-12-03 17:04:11 -05:00
Isaac Connor 4a884afecb need the update file 2017-11-26 15:08:12 -05:00
Isaac Connor 4b92a788f7 fix filter execute 2017-11-24 15:37:50 -05:00
Isaac Connor 9d6b417b60 make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts 2017-11-22 17:03:37 -08:00
Isaac Connor 1fe421ed9d add DiskSpace columns to Monitors 2017-11-22 14:22:12 -08:00
Isaac Connor 1745c83d2f add eventcount columns to Monitors 2017-11-22 14:04:07 -08:00
Isaac Connor cd1d2e1721 lots more debugging. re-add status update command on failure 2017-11-22 01:18:07 -05:00
Isaac Connor 489d3ba6ed Merge ../ZoneMinder.master into storageareas 2017-11-21 12:23:17 -05:00
Isaac Connor 7cdd6b2596 fix crap from merge of Floreen camera ptz 2017-11-21 12:19:47 -05:00
Ognyan Bankov ded6b1864a 2006 support floureon 1080p 18x 30x (#2007) 
* perl control script for Fluoreon 1080p

* DB update for Floureon cameras support
 2017-11-18 19:02:23 -05:00
Isaac Connor d411ed329b get rid of mistyped zmaFPS and zmcFPS 2017-11-16 09:14:26 -05:00
Daniel Hodgson bfd28dda71
Update zm_create.sql.in 
Added missing column `AnalysisFPS`
 2017-11-15 17:59:07 -08:00
Daniel Hodgson 087a902698
Update zm_create.sql.in 
The `CaptureFPS` column is missing in the db creation script, causing errors in the Log whenever a monitor is queried.
 2017-11-15 17:44:59 -08:00
Isaac Connor a7f590a28d add value for the DiskSpace column 2017-11-01 12:37:08 -04:00
Isaac Connor ac6964b159 add position clearing to other Layouts 2017-11-01 11:56:18 -04:00
Isaac Connor b1cb83c8ff Freeform layout has to clear left,top,bottom,right 2017-11-01 11:53:45 -04:00
Isaac Connor 36e13039c7 Switch to LONGTEXT FROM JSON type 2017-11-01 11:05:21 -04:00
Isaac Connor 3deb8a35bb fixes 2017-10-30 21:38:27 -04:00
Isaac Connor b5491102ef Fix saving MontageLayouts 2017-10-30 20:21:16 -04:00
Isaac Connor 01acd154f9 fix adding Layouts 2017-10-30 16:28:55 -04:00
Isaac Connor a6c790b374 use a shared include for the filters bar 2017-10-30 07:37:08 -07:00
Isaac Connor f420dde04d fix quotes 2017-10-30 09:05:08 -04:00
Isaac Connor b3d420b13b add standard layouts to db creation 2017-10-27 12:06:07 -07:00
Isaac Connor 9942b886f2 conditionally add the standard layouts 2017-10-27 12:04:42 -07:00
Isaac Connor 60fb654a47 rough in the MontageLayouts table 2017-10-27 09:57:41 -07:00
Isaac Connor 127608e36a add Indexes to logs 2017-10-25 11:10:56 -07:00
Isaac Connor fdbbc5101e Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas 2017-10-24 16:10:20 -07:00
Isaac Connor e34ed8898a Add Index to Logs 2017-10-24 16:10:04 -07:00
Isaac Connor cfaf10335b add Monitor status, capturrFPS and AnalysisFPS to processes 2017-10-24 16:08:31 -07:00
Isaac Connor cedad14507 fix Load->CpuLoad 2017-10-24 15:13:02 -07:00
Isaac Connor f32103b01d Add Load, Mem, Swap to Servers 2017-10-24 14:21:25 -07:00
Isaac Connor 12fd1c151e add Load and Memory fields to Servers 2017-10-24 11:58:44 -07:00
Isaac Connor 57bc975454 Rouch in Maps 2017-10-23 10:52:51 -07:00
Isaac Connor c8cb00e57e fix typo 2017-10-16 08:30:28 -07:00
Daniel Hodgson 581b7262ce Fix error when creating DB with zm_create.sql 
The following command:
`mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql`

Throws the following error:
`ERROR 1136 (21S01) at line 603: Column count doesn't match value count at row 1`

This is due to a missing column when inserting into the Storage table on line 603
 2017-10-15 01:24:35 -07:00
Isaac Connor b96b2636bb add the update to add Type to Storage 2017-10-12 07:50:43 -07:00
Isaac Connor 8abb8a9259 add Type to Storage 2017-10-12 07:32:48 -07:00
Isaac Connor e16d852248 make DiskSpace be a bigint 2017-10-11 14:07:01 -04:00
Isaac Connor c654d008f0 add monitor selector to montagereview and montage. 2017-10-10 09:36:56 -04:00
Michael Barkdoll fa7f6088c8 Update zm_create.sql.in 
Add support for TVIP672WI
 2017-10-09 11:14:13 -05:00
Isaac Connor 20087e69e6 TEXT cannot have a default value 2017-10-04 22:22:28 -04:00
Isaac Connor b2426321b0 increase the length of MonitorIds in Groups 2017-10-04 21:53:47 -04:00
APHW2 MFGENG 354262c557 wip nvsocket 2017-10-03 13:28:56 -07:00
Isaac Connor e8cc0d8256 set a default on DefaultVideo 2017-10-02 15:43:15 -04:00
Isaac Connor 99c602e83d add ParentId to Groups, bump version 2017-09-28 12:23:23 -04:00
Isaac Connor a5079f205e add Manufacturers and Models Tables 2017-08-25 15:35:17 -04:00
Isaac Connor b3984ea2da Merge branch 'master' into storageareas 2017-07-14 10:38:20 -04:00
Martin Goodwell 3789dcb5de Introducing Maginon Supra IPC camera Controls and script (#1947) 
* Added Maginon Supra IPC to Controls

* Adding support for Maginon Supra IPC camera
 2017-07-13 11:10:20 -04:00
Isaac Connor 4a90980fbe add Id to Filters 2017-07-11 20:35:56 -04:00
Isaac Connor 046acbc05b fix some field 2017-07-11 20:34:06 -04:00
Isaac Connor 6c68ca40e4 add some indexes 2017-07-11 20:33:09 -04:00
Isaac Connor 8497e4c24d remove tilde 2017-07-11 14:59:55 -04:00
Isaac Connor 786dcb0dc1 Add orientation to Events 2017-07-11 14:31:41 -04:00
Isaac Connor cb98e3faea bump version to 1.31.3 2017-07-11 14:11:15 -04:00
Isaac Connor a1d1a6a0d4 fix Options and and Protocol which can be NULL 2017-06-28 11:32:18 -04:00
Isaac Connor 085d239a6e Merge branch 'master' into storageareas 2017-06-13 18:02:28 -04:00
Isaac Connor 01717a5c14 Merge branch 'master' into filter_by_runstate 2017-06-06 20:34:47 -04:00
Isaac Connor a515041e14 Merge branch 'master' into storageareas 2017-05-23 15:17:46 -04:00
Isaac Connor 655839e56a Allow NULLS in various fields 2017-05-23 14:20:19 -04:00
Isaac Connor 433515dba9 Allow NULLS in LinkedMonitors 2017-05-23 14:14:24 -04:00
Isaac Connor 739d1e5304 Add lines to Convert db to allow NULLS 2017-05-23 14:07:10 -04:00
Isaac Connor f4224bb88e Merge branch 'master' into storageareas 2017-05-17 17:47:39 -04:00
Steve Gilvarry 44f3738b4b Move h264 db script to 1.30.5 (#1884) 
* Move h264 db script to 1.30.5

* Move h264 db script to 1.31.0
 2017-05-16 15:19:31 -04:00
Isaac Connor c859f7291c Feature h264 videostorage (#1882) 
* Moved writing of configure options from Controller to Model.  Fixes #191.

* Initial commit for saving events as videos :)

* Add zm_video.cpp to autotools

* Add zm_video.h to autotools

* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h

* Fix serve memory leak

* Few minor code improvements

* Added the ability to override preset, tune, profile and few other improvements

* Correctly write SPS & PPS from x264 encoder headers

* Remove unnessecary SPS & PPS writing code

* Imported missing files from master to feature-h264-videostorage

* Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem)

* Updates to make gcc happy

* Add html5 video control to timeline and event to support mkv playback

* Add zm_videostore.cpp to CMakeLists.txt

* Remove Modern Branch for now

* Fix minor bug

* Option handled added in master, removing duplicate declaration

* Add CaptureandRecord from zm_camera.h

* Putting placeholder in for CaptureAndRecord function

* Removed duplicate code and brackets

* add digest auth file for cmake

Conflicts:
	src/CMakeLists.txt

* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"

This reverts commit d9bbcdf3a9.

* Add CaptureAndRecord to vlc, still need to make it record

* Resolve SegFault on videostore

* Swap to mp4 container

* mp4 changes

* spaces to tabs, hide video stuff if video writer is turned off

* Make timeline open event.mp4 instead of mkv

* Missed mkv in timeline.js

* Fix some issues from the merge conflict

* Resolve post merge build issues with braces

* Fix whitespace

* Update Jpeg and Video options for passthrough options

* Whitespace fix zm_camera.h

* Fix array mkssing comma

* Add support for Jpeg save options for h264 branch snapshot. Might remove altogether if snapshots not needed

* Update VideoStoreData memory size comment

* Change from config.use_mkv_storage to per monitor option VideoWriter from video branch

* Fix bracket issues post merge

* Clean up comments and add av_free_packet

* Convert from event_directory to event file as per Video branch

* Testing videojs for video playback

* Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors

* bring recent improvements in ffmpeg capture function into captureandrecord

* Remove pict from writeAudioFramePacket as not used

* Add translate options for h264 Storage options in Monitor and update en_gb file

* Cherry-Pick from iconnor - make it compile on ubuntu 15.04.  Which is libav 56.1.0

Conflicts:
	src/zm_ffmpeg.cpp
	src/zm_remote_camera_rtsp.cpp

Conflicts:
	distros/ubuntu1204/changelog

* Clean up videostore code and remove lots of unused code

* proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate

Conflicts:
	web/skins/classic/views/event.php

* removed redundant field in sql query

Conflicts:
	web/skins/classic/views/event.php

* local storage of video js plugin

* Beautify!

Make the code somewhat readable.

* added missing videojs.zoomrotate.js file

added missing videojs.zoomrotate.js file

* Typo

added missing "

* Added missing brackets

* fix to display thumbnails when only storing snapshot.jpg

* added control for video playback rate

Conflicts:
	web/skins/classic/views/event.php

* dynamically create jpegs from video file for viewing in browser

* fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)

* only expose monitor info which are being used in client

* fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8)

when libx264 is not installed

* better way of detecting showing image or video in timeline and event view

instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view

this also fixes loading videos in timeline view

* Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22).  Prefilters common packet issues. Add metadata title to generated video file

* Remove syslog.h

* fixed SaveJPEGs are not working

which is caused in errors introduced when merging with master

* Update README.md

* Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues

* Fix PRId64 issue in travis, builds locally fine, but I can see a gcc version issue here

* Fix PRId64 issue in travis, another try

* Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3

* Revert space removal around PRId64

* video branch ffmpeg 2.9 fixes

ffmpeg 2.9 patched removed SSE2 CPU

* Add FFMPEGInit back

* use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event

also fixed bug which prevented seeking in timeline video preview

* ffmpeg 3.0 API build failure fixes

* Update README.md

* merge all the commits from the messed up iconnor_video branch

* fix whitespace

* revert

* whitespace fixes

* spelling fix

* put back some text

* add these back

* fix spelling mistake

* Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines

* add a test and error message if the codec is not h264

* these have been removed in master

* add a view to check auth and just send the video

* add some comments, and dump filename and AVFormatContext on failure to write header

* add the toggle for RecordAudio so that the checkbox works to turn off Audio

* Must init videoStore in constuctor

* more debug and comments, return checking

* Fix dropped part of sql query.

* fix extra else and some whitespace

* Fix missing } from merge that was preventing building.

* fix tabs

* get rid of use of separator, just use \n

* Restore lost fixes for deprecation

* Why are these failing

* Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio

* Forgot that I was trying to solve case of stream is true and record_audio
is false.

* Pass swscale_ctx back in to getCachedContext or it will create new
context every frame and leak memory like a mofo.

* Add libx264-dev and libmp4v2-dev to build requires to save hassle of
ensuring they are installed before build.

* Merge my Rotation/Orientation work and fixes for bad h264 streams

* need arpa/inet for reverse lookups

* pull in the new byte range code for viewing videos

* Move our recording flag deeper into closeevent

* add braces and only call closeEvent if there is an event

* deprecate the z_frame_rate stuff which is deprecated in ffmpeg

* remark out some debugging

* fix for video on stream 1

* fix audio_stream to audio_st

* Ignore bad decodes

* fix problems with content-length causing viewing to not work in chrome/android

* change logic of sending file contents to handle an off by one and be more readable

* Some fixes pointed out by Maxim Romanov.  Also simply the loading of events to not join the Monitors table

* fix to sql for timeline

* added RecordAudio to sql in README

* Use sub queries instead of joins to fix errors when using new mysql defaults.

* fix sql queries

* Dockerfile to build feature-h264-videostorage

* Must cast codec

* add php-acpu as a dependency

* require php5-acpu

* fix typo

* remove extra /

* Add a line for out-of-tree builds to do api/lib/Cake/bootstrap.php

* delete merge conflict files

* delete merge conflict files
 2017-05-15 22:02:48 -04:00
Isaac Connor fd44ff4e60 Merge branch 'master' into storageareas 2017-05-10 13:16:08 -04:00
Andy Bauer 12fc011a29 1.30.4 release 2017-05-09 09:54:48 -05:00
Isaac Connor 6dcad09c65 this was never commited and got lost. Merge it's content into zm_update-1.31.0.sql 2017-05-05 16:53:49 -04:00
Isaac Connor cb6d7c7c61 further allow NULL updates 2017-05-05 16:53:38 -04:00
Isaac Connor 1cd01be0b0 blah 2017-05-05 16:52:30 -04:00
Isaac Connor cccc3df700 Merge branch 'master' into storageareas 2017-05-03 16:43:44 -04:00
Andy Bauer fd8aa62927 bump 1.30.3 release 2017-05-02 13:25:56 -05:00
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 7fef8b87ad Add Preset for IP Webcam 2017-01-02 12:17:23 -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
Isaac Connor 89cff287cd Merge branch 'master' into storageareas 2016-02-04 12:14:16 -05:00
Isaac Connor d65c9d797b fix merge, update to 1.30.1 2016-02-04 12:13:48 -05:00
Isaac Connor 9ace6c518d Merge pull request #1225 from Simpler1/profiles 
Added profiles for Wanscam-HW0025 and IPCC-7210W
 2016-02-04 11:55:48 -05:00
Brandon Odegard 029c1efa31 Corrected update version comment to 1.28.110 
Corrected version comment to indicate database update from 1.28.109 to 1.28.110
 2016-01-22 10:48:47 -06:00
Brandon Odegard 8753ee98e5 Corrected update version comment to 1.28.109 
Corrected version comment to indicate an update from 1.28.108 to 1.28.109
 2016-01-22 10:46:46 -06:00
Isaac Connor ddf7b1ad43 Merge branch 'master' into storageareas 
Conflicts:
	web/skins/classic/js/dark.js
	web/skins/classic/js/flat.js
 2016-01-14 09:41:24 -05:00
Isaac Connor 47d4331d62 Add Hostname Column to create script, to match update 2016-01-10 20:58:45 -05:00
Simpler1 0d5d43251f Added lines to db/zm_create.sql.in for two cameras 2016-01-04 15:51:11 -05:00
Isaac Connor b1205bcaa9 Merge branch 'multi-server' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	scripts/zmaudit.pl.in
	version
 2016-01-02 14:45:24 -05:00
Isaac Connor 93dbc3f0c1 Merge multi-server updates and bump version 2016-01-01 16:31:02 -05:00
Andy Bauer 94ce84af40 Bump version to 1.29.0 2016-01-01 10:15:36 -06: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 3802d16922 add ServerId to Events Table 2015-12-15 12:09:11 -05:00
Isaac Connor a196906345 Move where StorageId goes to after ServerId 2015-12-15 09:12:11 -05:00
Isaac Connor 43968b7862 add Storage table creation 2015-12-14 17:03:45 -05:00
Isaac Connor 9488f71244 Add zmupdate script to add Storage table and StorageId to Monitors, and bump version 2015-12-14 17:00:04 -05:00
Isaac Connor b2b1afa8ad Merge master 2015-12-14 15:49:32 -05:00
Isaac Connor 7f5958d873 remove comma that shouldn't be there 2015-11-16 11:01:41 -05:00
Isaac Connor 0ee7b3d729 add hostname to Servers table 2015-11-11 16:54:41 -05:00
Isaac Connor 5e70146b0e Monitor->Frames, since we are updating Frames 2015-11-11 16:43:57 -05:00
Robin Daermann 1f1b48ed51 Added Vivotek ePTZ control to zm_create.sql 2015-11-04 19:17:47 +01:00
Robin Daermann 330e0d7adf Add Vivotek ePTZ control module to database 2015-11-04 17:29:07 +01:00
baffo32 d0ce4904ff Stray semicolon causes SQL error 
also normalized space around '='
 2015-10-24 17:58:20 -04:00
Kyle Johnson e51ff0677f Fix typo in Frames index creation. I hope 2015-10-22 12:12:56 -06:00
Kyle Johnson 356fadbff8 Add index to Frames table for people updating 2015-10-22 11:36:55 -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 291dfe0f70 Add db update script for 1.28.107. Fixes #663 2015-09-29 14:38:41 -06:00
Kyle Johnson 679a663861 Change Frame to have a PrimaryKey called ID 2015-09-29 14:30:54 -06:00
Isaac Connor bfba16b87c Fix message if Exif already exists 2015-09-17 15:16:05 -04: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
Andy Bauer 4fdd32b596 bump version to 1.28.106 2015-08-29 07:53:08 -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 b18ffdc13e States table updated to unique Name column 2015-08-26 11:20:22 -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
Robin Daermann 299c629a20 Merge remote-tracking branch 'upstream/master' into large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-17 13:42:36 +02:00
Robin Daermann 0547a66870 Bump version to 1.28.102 2015-08-17 13:40:30 +02:00
Andrew Bauer 3489d0d734 add Exif column to sql database 2015-08-16 17:43:45 -05:00
Andrew Bauer 461f81089b change table name from monitors to users 2015-08-15 15:42:00 -05:00
Andrew Bauer 36c7d7f9c2 Add Group Edit permission to the default admin account 2015-08-15 14:58:41 -05:00
Andrew Bauer c828a3df33 typo 2015-08-15 12:13:35 -05:00
Andrew Bauer 936aa00a5e add sql bits 2015-08-15 12:00:48 -05:00
Robin Daermann 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
Emmanuel Papin 2ccb378e2d Fix a typo error in sql file 2015-07-24 00:25:57 +02: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 bd84830433 fix comment 2015-07-14 16:10:09 -04:00
Isaac Connor 2819585cdb move add ServerId to Monitors to zm_update-1.28.100.sql 2015-07-14 16:09:01 -04:00
Isaac Connor bc0090f6f7 fix PRIMARY KEY update on States 2015-07-07 15:46:44 -04:00
Isaac Connor 1328ba456a fix drop primary key line. 2015-07-07 09:43:56 -04:00
Isaac Connor 6d33da6245 Add ServerId to Monitors 2015-07-02 14:17:49 -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
Jan M. Hochstein c3ecaa4e67 Corrected default value for column 'ConfigType' 2014-12-14 11:49:10 +01: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
Jan M. Hochstein 4a39b3215b New monitor function 'Extdect' 2014-12-05 09:29:57 +01: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
Isaac Connor fc28fee7ef add the db updates for the V4L changes 2014-11-14 17:20:57 +01:00
Isaac Connor c80bf07ea7 move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera 2014-11-14 17:17:09 +01:00
Jan M. Hochstein 5c6fe54265 Persistance and UI for ONVIF monitor options 2014-11-14 17:17:09 +01:00
Andrew Bauer d290af2c9f Move ONVIF control script & add dB entry 2014-11-14 17:11:22 +01: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
tim 05e395613b Adding PTZ module for Toshiba IK-WB11A 2014-01-14 00:58:12 -08:00
Kfir Itzhak 9901ce9e84 Merge remote branch 'origin/master' into curl 2014-01-05 10:16:01 +02:00
Kfir Itzhak 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
Isaac Connor b3af313370 Merge pull request #282 from scottgrobinson/master 
Add zmMontageScale so montage scale is also 'saved'
 2014-01-02 11:18:39 -08:00
Andrew Bauer 2f3934c20e Merge pull request #289 from dmak/foscam 
Foscam IP cameras control script
 2014-01-01 07:30:46 -08:00
Dmitry Katsubo 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
Dmitry Katsubo 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
Kfir Itzhak ff9a26273c cURL is now working! 2013-12-27 18:02:32 +02:00
Kfir Itzhak 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
Scott Robinson f2d9deaed6 Update test.monitor.sql 
testing travis build
 2013-12-24 11:07:27 +00:00
Andrew Bauer 6d093c0407 Merge pull request #276 from knnniggett/foreign 
Disables non-POSIX warning when using gnu wildcard
 2013-12-23 14:49:19 -08:00
Edward Barnard 3321506b45 Working libvlc camera implementation. 2013-12-19 21:51:39 +00:00
Andy Bauer 283091a88e Disables non-POSIX warning when using gnu wildcard 2013-12-19 14:10:22 -06:00
Isaac Connor 433370c9e3 Merge branch 'master' into storageareas 
Conflicts:
	distros/ubuntu1204/changelog
	src/zm_monitor.h
 2013-12-15 15:16:14 -05:00
Andrew Bauer e68fd9db91 Automatically grab all sql scripts in the db subfolder 2013-12-14 09:45:18 -06:00
Andrew Bauer 8265eb98dc Add reference to zm_update-1.26.5.sql in Makefile.am 2013-12-13 18:51:39 -06:00
Kyle Johnson 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
Isaac Connor 0c18f11764 add inital table definition for Storage 2013-12-13 13:07:18 -05:00
Kfir Itzhak c08e4de42e Added the database update file for 1.26.5 with includes the AlarmRefBlendPerc option 2013-11-07 16:29:02 +02:00
Kfir Itzhak 8e96df7643 Initial work on adding cURL to zoneminder 2013-11-04 16:52:21 +02:00
Kfir Itzhak fd656c55cf Changed default blend percentages and the dropdown list for alarm reference image blend 2013-11-04 12:10:53 +02:00