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

2081 Commits

Author SHA1 Message Date
Isaac Connor c74cc54ac0 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2016-10-26 13:34:30 -04:00
Isaac Connor 98cde11e86 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2016-10-26 13:34:28 -04:00
Steve Gilvarry 0409ae5582 Merge pull request #1652 from connortechnology/fix_popup 
handle when window.open fails
 2016-10-20 05:17:44 +11:00
Steve Gilvarry 11cc73f55d Merge pull request #1651 from connortechnology/fix_disable_monitor 
Fix logic when disabling a monitor
 2016-10-20 05:16:22 +11:00
Steve Gilvarry c78a543e8e Merge pull request #1475 from connortechnology/htmlselect 
introduce htmlselect as an alternative to buildselect
 2016-10-20 05:05:59 +11:00
Pliable Pixels 192d0dbb45 added TimeZone get API 2016-10-18 14:07:31 -04:00
Isaac Connor c02b840274 Fix logic when disabling a monitor 2016-10-11 12:10:47 -04:00
Isaac Connor ded1e0ea73 handle when window.open fails 2016-10-11 11:48:29 -04:00
Jeff Vogt 3801d9e43e Disabled autocorrect, autocapitalize, spellcheck on username field for login form 2016-10-10 11:27:36 -07:00
Andrew Bauer 7b574e0d41 Merge pull request #1645 from connortechnology/fix_onvif 
Fix onvif
 2016-10-04 16:34:58 -05:00
Isaac Connor ac24865647 add NoDetectProfiles instead of reusing NoDetectedCameras 2016-10-04 14:33:51 -04:00
Isaac Connor 6814bcc791 add NoDetectProfiles instead of reusing NoDetectedCameras 2016-10-04 14:33:38 -04:00
Isaac Connor 09c5e3012a username and password don't actually have to be specified 2016-10-04 14:09:32 -04:00
Isaac Connor 21a94a6200 better error message 2016-10-04 10:29:37 -04:00
Pliable Pixels 92d7cad5f1 enabled utf8 2016-09-21 11:53:34 -04:00
Isaac Connor 5f46b8f942 Merge pull request #1621 from connortechnology/fix_1620 
ptzControl expects a monitor object instead of a dbrow array.
 2016-09-15 10:18:26 -04:00
Isaac Connor db8cada380 fix merge 2016-09-13 15:01:02 -04:00
Isaac Connor 54db9f2e3a ptzControl expects a monitor object instead of a dbrow array. 2016-09-12 21:36:03 -04:00
Steve Gilvarry 563f4a9d46 Merge pull request #1505 from ZoneMinder/fix_filter_actions 
Confirmed check box status is now retained after save and changing filters.
 2016-09-11 14:13:51 +10:00
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
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 55f5db55dd implement suggested code to stop the monitor when Function is set to None 2016-09-01 11:43:20 -04:00
David Sabbath Grits 2d44531d1f add some more translation 2016-08-25 14:24:14 +02: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
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
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
Andrew Bauer 24d471f452 Merge pull request #1503 from ZoneMinder/id_on_console 
add option to show monitor ID on console
 2016-08-06 10:59:03 -05:00
Isaac Connor 9d65ef3bb2 Merge pull request #1556 from knnniggett/banner 
custom banner text on web console
 2016-08-06 10:59:53 -04:00
Andrew Bauer 382896dc0d Merge pull request #1498 from josh4trunks/mysql_port_socket 
Add support for MySQL Port / Unix Socket
 2016-08-06 09:32:32 -05:00
Isaac Connor aa78b403a1 zmaControl can take an id #, so need to move the check for local server test down. 2016-08-02 12:33:41 -04:00
Isaac Connor 8093470a2e make only the editing polygon have a border. Set default for Type when creating a new zone 2016-08-02 12:19:55 -04:00
Isaac Connor b522371080 include polygons for the other zones. 2016-08-02 12:02:07 -04:00
Andy Bauer 19265b631a custom banner text on web console 2016-07-09 13:11:30 -05:00