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

4240 Commits

Author SHA1 Message Date
hanzese db86ac7b40 Update et_ee.php 
ZoneMinder Estonian Translation by Hannes
 2014-11-17 18:06:37 +02:00
Isaac Connor 4f9a2e1689 update Depends to match ubuntu. 2014-11-17 09:17:03 -05:00
hanzese 79ca3dd736 Update et_ee.php 
ZoneMinder Estonian Translation
 2014-11-17 02:53:50 +02:00
Emmanuel Papin a03b3ce4e0 Increase buffer size for sql events 2014-11-17 00:21:03 +01:00
Emmanuel Papin ecd9ab95eb Fix error messages when loading plugins 2014-11-16 21:50:39 +01:00
Emmanuel Papin e7f1c8b5d8 Fix logging issue with plugins 2014-11-16 20:46:24 +01:00
Andrew Bauer 729d4dd9c4 Update README.md 2014-11-15 13:47:47 -06:00
Andrew Bauer ef3f06bc62 Update README.md 2014-11-15 13:39:32 -06:00
Andrew Bauer 83026fba98 Update README.md 2014-11-15 13:38:51 -06:00
Andrew Bauer a9de2416b8 Update README.md 2014-11-15 13:19:02 -06:00
Andrew Bauer 32ee3e8431 Merge pull request #577 from knnniggett/zmeditconfigdata 
Add zmeditconfigdata.sh script to source
 2014-11-15 13:15:45 -06:00
Kyle Johnson d5181ff6d4 Merge branch 'api-updates' 2014-11-15 19:06:58 +00:00
Kyle Johnson 35530c627a Initial commit of Logs MVC 2014-11-15 19:03:40 +00:00
Kyle Johnson 0129ca5f74 Rework the ConfigParser component. 2014-11-15 19:03:10 +00:00
Kyle Johnson e7d726bf75 Don't print out the Config string to the file system. 2014-11-15 19:02:54 +00:00
Kyle Johnson fcaa67e3c3 Slight refactor of ConfigParser Component. Needs more work. 2014-11-15 19:02:18 +00:00
Kyle Johnson cf3d0f962c Add view for Configs Edit 2014-11-15 19:02:03 +00:00
Kyle Johnson 9f80a7d5f5 Show a list of Config Key:Value pairs 2014-11-15 19:01:32 +00:00
Kyle Johnson 9268c503af Do not display the "hidden" config category 2014-11-15 19:01:19 +00:00
Kyle Johnson b9f54056da Add component for dumping Config table as HTML 2014-11-15 18:59:58 +00:00
Kyle Johnson de631075d3 Return possible source types ni DB via API 2014-11-15 18:59:24 +00:00
Kyle Johnson 0d57306790 Find category configs only when $category is not null. API 2014-11-15 18:58:58 +00:00
Kyle Johnson 9f150c4e46 Revert "Find category configs only when $category is not null. API" 
This reverts commit efbbcadc7dad9aa52a7aab0483546eab48840ae6.
 2014-11-15 18:58:51 +00:00
Kyle Johnson b88febeaee Find category configs only when $category is not null. API 2014-11-15 18:58:43 +00:00
Andrew Bauer 2dc73810db Update rpm specfiles to make use of zmeditconfigdata.sh 2014-11-15 12:55:33 -06:00
Kyle Johnson 0a7ba112ab API support for querying config categories. 
Either return a list of distinct categories, or all configs under a
certain category
 2014-11-15 18:55:20 +00:00
Andrew Bauer 790ecba0b2 Move script to /utils 2014-11-15 12:48:01 -06:00
Andrew Bauer 5a59a0375d Add zmeditconfigdata.s script to source 2014-11-15 10:49:53 -06:00
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