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

6370 Commits

Author SHA1 Message Date
Andrew Bauer e35ef3ce83 Merge pull request #1617 from coracis/master 
Update German translation
 2016-09-09 08:55:19 -05:00
Andrew Bauer 321deb5506 Merge pull request #1599 from sabbath88/master 
add some more translation
 2016-09-09 08:40:05 -05:00
corax 070051d06a Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9' 
For easy pull-requesting
 2016-09-09 14:20:03 +02:00
corax 6fab2e97b1 Update German translation of Buffer 2016-09-09 13:32:20 +02:00
corax b10c79b4f7 Add translation for 'Montage Review' 2016-09-09 13:26:19 +02:00
corax 6b18184e4a Remove confusing link to web console 2016-09-09 12:38:30 +02:00
corax 4dc6fc03b3 Add a missing translate()-call 2016-09-09 12:35:34 +02:00
corax 430ecd8e32 Fix some too direct translations into German 2016-09-09 11:51:53 +02:00
corax d017138550 Fix a 'false friend' in German translation 2016-09-09 11:25:12 +02:00
Isaac Connor 3c228e6c16 Merge pull request #1614 from pliablepixels/1537-zone-controller-bug 
1537 zone controller bug
 2016-09-07 12:52:09 -04:00
Pliable Pixels 1440dd9265 retab 2016-09-03 15:02:32 -04:00
Pliable Pixels 7bf0b3c423 readded forMonitor - removed by mistake 2016-09-03 14:51:24 -04:00
Pliable Pixels 9a4330eb59 #1537 Zones Controller not returning all zones 2016-09-03 14:46:47 -04:00
Kyle Johnson d6852e10b7 Merge pull request #1609 from connortechnology/fix_1606 
implement suggested code to stop the monitor when Function is set to …
 2016-09-01 22:57:57 -06:00
Isaac Connor dfb06fd548 Merge pull request #1607 from mattdurant/fix_issue_1460 
Fix issue #1460
 2016-09-01 14:02:13 -04:00
Isaac Connor 21431a5733 Merge pull request #1608 from mattdurant/issue_1590 
Added check for SINGLE_IMAGE to ignore socket closed by remote side
 2016-09-01 12:30:47 -04:00
Isaac Connor e0472cf820 Merge pull request #1602 from mdrush/1601-fix-ssmtp-messages 
added missing ssmtp support in sendMessage
 2016-09-01 11:49:42 -04:00
Isaac Connor 55f5db55dd implement suggested code to stop the monitor when Function is set to None 2016-09-01 11:43:20 -04:00
Matt Durant 350352d956 Added check for SINGLE_IMAGE if ReadData() detects the socket closed by remote side to return 0 instead of -1. 2016-08-31 20:56:30 -05:00
Matt Durant 0950ecbcb9 Replaced loops to create color tables during initialization with statically declared arrays. 2016-08-31 19:36:14 -05:00
Kyle Johnson 3320ad24ea Merge pull request #1605 from ZoneMinder/mageia-fix-spelling 
Correct spelling of 'Mageia' in readme
 2016-08-30 09:47:50 -06:00
Kyle Johnson 4b6b28983e Correct spelling of 'Mageia' in readme 2016-08-30 09:47:08 -06:00
Isaac Connor 4c96d12009 Merge pull request #1604 from donnieblaw/typo_getstarted 
Fix name of OPT_USE_AUTH option in getting started guide.
 2016-08-30 09:24:31 -04:00
Don Law 28b18066a9 Fix name of OPT_USE_AUTH option in getting started guide. 2016-08-29 20:34:54 -04:00
mdrush 69a71b1a37 cleaned up logic 2016-08-27 16:16:01 -07:00
mdrush 16a9de3b1b added missing brackets 2016-08-27 15:39:04 -07:00
mdrush 2d161924c0 changed error message to debug message 2016-08-27 15:34:10 -07:00
mdrush 52255e594e improved style, added fallback when ssmtp can't be found 2016-08-27 15:18:00 -07:00
mdrush 574390730a added missing ssmtp support in sendMessage 2016-08-27 13:10:39 -07:00
David Sabbath Grits 2d44531d1f add some more translation 2016-08-25 14:24:14 +02:00
Isaac Connor 69461a7c1b Merge pull request #1579 from peruchi/master 
Update file sock for multiserver
 2016-08-17 10:23:01 -04:00
Andrew Bauer 7d48b2c6c5 Merge pull request #1577 from ZoneMinder/fix_zmaControl 
fix error in calling zmaControl
 2016-08-17 08:36:51 -05:00
peruchi 50f55af68f Update zmdc.pl.in 2016-08-17 10:36:00 -03:00
peruchi 7b389a79a6 Update zmdc.pl.in 2016-08-17 09:45:30 -03:00
Isaac Connor cc696cbbc6 Merge pull request #1594 from vikaskedia/patch-2 
Update README.md
 2016-08-16 11:42:26 -04:00
Andy Bauer 4895942308 update fedora rpm readme 2016-08-16 09:49:45 -05:00
Andrew Bauer ea34f3d69a Merge pull request #1576 from ZoneMinder/show_other_zones 
include polygons for the other zones.
 2016-08-15 20:36:16 -05:00
Isaac Connor 872adc1c62 Merge pull request #1578 from erelson/patch-2 
Minor API doc error fixes
 2016-08-15 10:02:57 -04:00
Vikas Kedia 31ca095445 Update README.md 2016-08-15 04:39:04 -07:00
Andrew Bauer cd55c8b2fb Merge pull request #1585 from ZoneMinder/copy_av_dict_parse_string_from_ffmpeg 
Fixes #1584. I've just copied the relevant functions from ffmpeg sour…
 2016-08-14 11:02:48 -05:00
Andrew Bauer 31cb86046c Merge pull request #1592 from connortechnology/fix_analysis_frame 
Fix analysis frame
 2016-08-14 10:54:46 -05:00
Isaac Connor a0bc30d3fe fix the order of analyse/capture being passed 2016-08-12 15:40:47 -04:00
Isaac Connor 240336e3ec silence error when Event has no StorageId set 2016-08-12 15:20:21 -04:00
Isaac Connor 9106675842 pass capture or analyse to getImageSrc 2016-08-12 15:17:13 -04:00
Isaac Connor bcb7dd1ba4 take optional show= to specify the analyse image or the capture image 2016-08-12 15:16:05 -04:00
Isaac Connor 3dadcc8d32 add ability to pass show=capture or show=analyse to getImageSrc 2016-08-12 15:14:51 -04:00
Isaac Connor bc4923b555 use instead of for the frame object and pass to getImageSrc which expects an array 2016-08-12 13:50:18 -04:00
Isaac Connor 3dc2170a69 Merge ../ZoneMinder.master 2016-08-12 12:48:34 -04:00
Isaac Connor 1058796374 add an echo to tell us that updating is done and we are trying to start. 2016-08-12 10:04:35 -04:00
Isaac Connor bdcc53d309 add an echo to tell us that updating is done and we are trying to start. 2016-08-12 10:04:10 -04:00