Commit Graph

4062 Commits

Author SHA1 Message Date
Emmanuel Papin 3d9a0f4729 Fix memory leaks in zmLoadConfig 2014-11-15 13:32:43 +01:00
manupap1 b2d3daaa65 Fix a mismatch free in zmc binary 2014-11-15 13:10:19 +01:00
manupap1 9eee62c6d2 Fix memory leaks in Image class 2014-11-15 12:58:08 +01:00
manupap1 658b9abea9 Fix memory leaks in Monitor class 2014-11-15 12:57:10 +01:00
manupap1 d2e849104c Fix memory leaks with rtsp and a bug 2014-11-14 22:31:03 +01:00
manupap1 a1aaeb7905 Merge branch 'master' into memory_fix 2014-11-14 22:24:33 +01:00
manupap1 b4732e4750 Close logger and database on exit 2014-11-14 22:17:44 +01:00
Andrew Bauer f120546f9e Merge pull request #573 from manupap1/rtsp_fix
Fix a bug when closing RTSP session over TCP
2014-11-14 09:57:19 -06:00
manupap1 f05699a005 Fix a bug when closing RTSP session over TCP 2014-11-14 11:17:27 +01:00
manupap1 dac1756d0d Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2014-11-14 10:55:05 +01:00
Andrew Bauer 3a9f814303 Merge pull request #572 from ZoneMinder/buffer_cleanup
remove the case for level >= 2.  Since level is a bool, this code can ne...
2014-11-13 15:47:37 -06:00
Andrew Bauer a00f719f12 Merge pull request #531 from SteveGilvarry/ffmpeg-stability-fixes
351-Rebase Attempt for ffmpeg stability fixes
2014-11-13 15:18:13 -06:00
Isaac Connor 9016e30f92 BSD uses /dev/bktr0 instead of /dev/video. This is actually pulled FreeBSD ports. 2014-11-13 14:47:07 -05:00
Isaac Connor 72f34203a0 remove the case for level >= 2. Since level is a bool, this code can never execute. Also, there are no calls to tidy in the current code with values other than 0 or 1, so it's safe to do. Also it removes an error message when using clang++ 2014-11-13 14:41:49 -05:00
Isaac Connor 9c30b806f2 don't require SystemView to view/select groups.
Change the way the groups ine is displayed to give people some idea that it might have something to do with grouping
use _POST instead of _REQUEST
2014-11-13 10:38:20 -05:00
Isaac Connor d6487e99b6 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-11-13 09:18:02 -05:00
Isaac Connor ebe35c2135 handle empty [file] to prevent logzilla 2014-11-13 09:17:54 -05:00
Andrew Bauer ae05563562 Merge pull request #564 from cosmedd/cmake-gnutls-fix
Use gnutls-openssl instead of gnutls to fix build with CMake.
2014-11-12 15:51:23 -06:00
Cosme Domínguez Díaz bcbb0c56a6 Apply knnniggett's solution on gnutls-openssl issue which
adds support for RPM based distros.
2014-11-12 22:39:54 +01:00
Andrew Bauer 3eafed81df Merge pull request #565 from cosmedd/debian-cmake-and-lintian
Debian package migration to CMake and some improves with lintian help
2014-11-12 07:00:31 -06:00
Andrew Bauer 72bfa0089c Merge pull request #570 from jmcastro2014/master
Add Control 3S N5071 Dome Ptz Camera
2014-11-12 06:49:28 -06:00
jmcastro2014 af57c177d7 Update zm_create.sql.in
Add Control 3S N5071 Dome Ptz Camera
2014-11-12 08:47:35 -03:00
jmcastro2014 5fe0b84b3c Create 3S.pm
3S API Control Protocol Module
2014-11-12 08:40:35 -03:00
manupap1 cee8b77bec Add plugin translations in language files 2014-11-12 10:20:18 +01:00
manupap1 eae1357a45 Support plugins in web user interface 2014-11-12 00:53:53 +01:00
manupap1 6d083fef10 Add libzmplugins.pc to .gitignore 2014-11-12 00:12:51 +01:00
manupap1 2a3068cfa7 Add an option to display the status of plugins in zmu 2014-11-12 00:11:41 +01:00
manupap1 f4bdee108f Add more files to .gitignore 2014-11-11 23:55:23 +01:00
manupap1 2033918b24 Add a pkg-config file 2014-11-11 23:53:09 +01:00
manupap1 7ff86427b3 Add config options for plugins in web ui 2014-11-11 23:40:42 +01:00
manupap1 65915c10e3 Update database schema for plugins 2014-11-11 23:35:01 +01:00
manupap1 003fafbf7d Build a convenience library for plugin development 2014-11-11 23:28:12 +01:00
manupap1 731fa96fdf Load plugins in Monitor class 2014-11-11 23:06:50 +01:00
Cosme Domínguez Díaz 7c8030fccf Restore README.md to 3fe5724ca0. 2014-11-11 23:06:34 +01:00
manupap1 12f0177f14 Add plugin options in configure 2014-11-11 23:03:25 +01:00
Cosme Domínguez Díaz 972dedd15a * distros/debian -> Autotools
* distros/debian_cmake -> CMake
2014-11-11 22:48:04 +01:00
manupap1 2796995d29 Update ImageAnalyser class 2014-11-11 22:46:58 +01:00
manupap1 199f399caf Add new files for plugin management 2014-11-11 22:39:20 +01:00
manupap1 15532e2a03 Fix issues with event notes 2014-11-11 22:31:58 +01:00
manupap1 5d5d9c5009 Add support for event with multiple causes 2014-11-11 22:08:55 +01:00
manupap1 217aafee5a Set a reference image for each zone 2014-11-11 21:48:56 +01:00
manupap1 0d430b5f4f Add new files to .gitignore 2014-11-11 21:47:42 +01:00
manupap1 9bfc64c4f9 Install the global plugin configuration file 2014-11-11 21:24:20 +01:00
manupap1 03d03bda21 Add a global configuration file for plugins 2014-11-11 20:59:58 +01:00
manupap1 e60c3d552c Remove unwanted dependencies 2014-11-11 20:24:48 +01:00
manupap1 26608afa2d Remove obsolete declaration 2014-11-11 19:49:28 +01:00
manupap1 93a29545ce Add libtool support for plugins 2014-11-11 19:46:20 +01:00
Andrew Bauer 2e8935daf2 Add the ability to specify the zm configdir at build time. 2014-11-11 09:15:15 -06:00
Cosme Domínguez Díaz 964cdde2b3 Use gnutls-openssl instead of gnutls to
fix build with CMake.
2014-11-11 00:34:23 +01:00
Andrew Bauer 26c9a77590 Update skin.js
Fix issue caused by a previous merge
2014-11-10 12:12:54 -06:00