Isaac Connor
|
d621222ead
|
fix assignment when should be test
|
2017-12-05 13:26:21 -08:00 |
digital-gnome
|
6edb0247ef
|
Fix popup detection
|
2017-12-05 13:27:39 -05:00 |
|
digital-gnome
|
34b708bace
|
Handle popups that should remain popups
|
2017-12-05 09:40:03 -05:00 |
|
digital-gnome
|
66d6e1a4a4
|
Add header to watch
|
2017-12-02 12:28:06 -05:00 |
|
digital-gnome
|
f02cd2e615
|
Remove watch popup
|
2017-12-02 12:28:04 -05:00 |
Isaac Connor
|
eb2ee76f57
|
disable and re-enabled onclick action when editing layout/cancelling edit
|
2017-11-01 13:08:01 -04:00 |
|
Isaac Connor
|
6d46b36c80
|
Hide close button if not in a popup
|
2017-08-01 14:21:50 -04:00 |
|
Isaac Connor
|
f4008e2c6a
|
Merge branch 'master' into storageareas
|
2017-05-19 11:20:33 -04:00 |
|
Isaac Connor
|
94f7194e4f
|
Update frmo SA. Use Monitor object, still hide Controls by default.
|
2017-05-18 21:48:21 -04:00 |
Isaac Connor
|
9f99d34807
|
fix calls to getStreamHTML
|
2017-03-13 14:22:33 -04:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
Isaac Connor
|
6c3a3d3d50
|
store the scale value for watch and event views in a cookie, differentiated by monitorId.
|
2016-09-27 09:46:04 -04:00 |
|
Isaac Connor
|
167214cb01
|
Merge branch 'cookie_scale' into storageareas
|
2016-09-27 10:05:16 -04:00 |
|
Isaac Connor
|
0580ef0c88
|
whitespace changes
|
2016-09-26 20:09:09 -04:00 |
|
Isaac Connor
|
1d1cedce95
|
use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode
|
2016-06-20 12:40:33 -04:00 |
Isaac Connor
|
8e7665d397
|
use getStreamHTML instead of duplicated code
|
2016-06-14 12:40:18 -04:00 |
|
Isaac Connor
|
bc99e4c476
|
whitespace changes
|
2016-04-17 09:29:14 -04:00 |
|
Isaac Connor
|
9dfe71ceb8
|
Always show events and always show ptz controls. Also clean out some commented out cruft
|
2016-04-04 11:39:12 -04:00 |
|
Isaac Connor
|
382ad0f390
|
put () after property names of Monitor object
|
2015-12-01 14:30:24 -05:00 |
|
Isaac Connor
|
ba1100fc03
|
continue conversion from array to class of Monitor
|
2015-09-17 16:06:47 -04:00 |
|
Isaac Connor
|
aac45e54b8
|
monitor array to class
|
2015-09-17 15:35:38 -04:00 |
Andrew Bauer
|
3a94712db2
|
add translate function
|
2015-05-10 08:10:30 -05:00 |
Emmanuel Papin
|
ac8ace33f8
|
Remove hardcoded localized strings and update lang files
|
2015-04-18 17:14:14 +02:00 |
|
Isaac Connor
|
b1aa349f11
|
add check to see if user has rights to view this monitor
|
2014-12-12 09:32:03 -05:00 |
SteveGilvarry
|
e87e69fa57
|
Ran script to replace all Short open tags
|
2014-12-05 10:44:23 +11:00 |
|
Isaac Connor
|
3393a63525
|
more updates
|
2013-12-17 12:53:15 -05:00 |
|
Isaac Connor
|
2a45506bff
|
more quoting removal
|
2013-10-17 16:15:04 -04:00 |
|
Knniggett
|
6d00540b5d
|
Improve Chrome browser support & log streaming events
|
2013-09-21 14:52:41 -05:00 |
stan
|
98203e6c2f
|
Improved stream handling for single image mode, for Chrome etc.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3281 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-02-06 16:04:11 +00:00 |
|
stan
|
eda9757415
|
Updated with new bandwidth based stream config. Fixed inadvertent triple equals comparison.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3169 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2010-11-03 16:40:33 +00:00 |
|
stan
|
60f0136ed3
|
Merged in image root changes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3040 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2010-02-28 19:16:40 +00:00 |
|
stan
|
9b31bf29e8
|
Added in image view to allow event root to be able web root
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3031 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2010-02-23 09:12:12 +00:00 |
|
stan
|
1fad2d7ec9
|
Changed query separator to & and miscellaneous html fixes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2982 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-10-16 17:09:16 +00:00 |
|
stan
|
c5a0f98309
|
Factored out action and request control functionality. Added presets to mobile view for PTZ cams.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2956 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-09-28 13:34:10 +00:00 |
|
stan
|
034f37cf4b
|
Applied contributed patch.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2890 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-05-25 18:03:46 +00:00 |
|
stan
|
4cf484e8ad
|
Changed > to >
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2711 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-12-06 00:54:15 +00:00 |
|
stan
|
276533129d
|
Made DVR control appearance conditional on replay buffer being set
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2694 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-12-05 18:46:32 +00:00 |
|
stan
|
e60149ce36
|
Modification to streaming to avoid making stream buffer if not required. Also cycle fix.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2679 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-10-29 23:08:21 +00:00 |
|
stan
|
ef8f7b85fd
|
Continuing development and bugfixes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-09-26 09:47:20 +00:00 |
|
stan
|
106882c161
|
Updated copyright notices
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-07-25 09:48:16 +00:00 |
|
stan
|
5789f6a38e
|
Fixed to work with overriden skins
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2591 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-07-22 16:24:36 +00:00 |
|
stan
|
58c861cd67
|
Fixed function call error
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2569 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-07-16 15:56:48 +00:00 |
|
stan
|
a65ab058db
|
Added simpler status query for still images
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2566 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-07-16 15:47:33 +00:00 |
|
stan
|
fad6b0ec11
|
PTZ control restructuring.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2554 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-07-16 13:16:19 +00:00 |
|
stan
|
2824cb7355
|
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-07-14 13:54:50 +00:00 |