d7a8947e05
Only include janus.js if needed
2022-02-08 13:33:02 -05:00
688f505f28
Adds better error handling, changes expected location of janus.js
2022-01-16 19:44:52 -06:00
2beffeb1b4
Add Janus to Cycle view. Remove debug Alert() messages
2022-01-12 22:47:35 -06:00
90e81c5774
Merge branch 'release-1.34'
2020-10-23 09:34:35 -04:00
080557d580
add an id to buttons div so that we can use it when calling scaleToFit
2020-10-19 14:27:43 -04:00
10c0a6617c
Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php.
2020-10-14 10:39:25 -04:00
81306928b8
Fix scale width and height dropdown actions on cycle
2020-09-15 18:53:39 -04:00
02d056b277
Fix left column positioning
2020-09-02 14:44:52 -04:00
3d3dde22c4
Use zm_session_start
2020-08-25 11:31:06 -04:00
3c29228df5
Use zm_session_start
2020-08-25 11:30:22 -04:00
dd627d9234
Update cycle monitorlist sidebar to bootstrap4
2020-08-04 17:35:41 -04:00
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
d6d70ab06d
Put a list of cameras to cycle through on the left
2020-07-04 09:04:26 -04:00
66b155008c
Fix scale defaulting to monitor default Scale
2020-07-03 19:17:11 -04:00
010b230804
Fix value of auto in width dropdown. Allow a 0 value for scale.
2020-04-23 16:30:39 -04:00
1cc60f0857
fix action on cycle play button
2020-04-02 16:06:27 -04:00
5c3b7f109e
fix cyclePlay button not working.
2020-02-25 13:17:45 -05:00
429000c13b
Fix value of auto in width dropdown. Allow a 0 value for scale.
2020-02-25 11:14:12 -05:00
96e29c0299
fix up remaining issues with cycle updates
2019-03-04 13:35:40 -05:00
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
e6ba8e58ef
Fix #2391 by defining monitor variable ( #2392 )
2019-01-05 10:20:34 -05:00
0824f740ae
Make video 100% width in cycle. Also fix monitors filtering by putting it in a form
2018-07-09 12:50:57 -04:00
ba8dc2059d
spacing
2018-07-09 12:33:21 -04:00
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
207d57a3e6
use xhtmlfooter function to finish off html
2017-10-02 11:55:52 -04:00
4be133ed09
remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin
2017-09-30 14:19:32 -04:00
26131f8a10
double quotes to single quotes
2017-05-30 11:52:48 -04:00
9f99d34807
fix calls to getStreamHTML
2017-03-13 14:22:33 -04:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
4caa20821a
fix
2016-07-14 11:57:06 -04:00
eb0ddc4e32
update and use Monitor object to generate the stream html. Also introduce a mode parameter to getStreamHTML to specify stills
2016-07-14 11:55:27 -04:00
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
967dda737c
more copying mysql2PDO from classic. Also, some fixes in classic
2014-03-21 17:16:56 -04:00
1519db78ce
add ServerHost filter
2013-11-13 10:13:09 -05:00
a155082997
use parameter passing instead of esacping
2013-11-12 15:39:29 -05:00
2a45506bff
more quoting removal
2013-10-17 16:15:04 -04:00
32578e3fbf
Updated with new bandwidth based stream config. Fixed inadvertent triple equals comparison.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3170 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:41:00 +00:00
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
31d349124d
Fixed with montage when groups empty
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2649 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 20:07:22 +00:00
8af774a98c
Fixes and patches.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2641 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-30 08:41:23 +00:00
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
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
7e40dc663c
Fixed canStreamApplet function call cockup
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2572 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 16:47:56 +00:00
33f161fede
Removed redundant MONTAGE_WIDTH/HEIGHT
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2522 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 09:04:09 +00:00
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
Isaac Connor
Jonathan Bennett
Isaac Connor
David Beitey
Andy Bauer
Isaac Connor
Andrew Bauer
SteveGilvarry
stan