Isaac Connor
fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
Isaac Connor
7b63461517
attempt to support redirecting to the given url instead of just refreshing
2017-03-27 13:13:08 -04:00
Matthew Noorenberghe
c7955cd1b6
Add eslint configuration files extending Google's rules
2017-03-18 00:02:17 -07: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
0358476ac0
Merge branch 'fix_popup' into storageareas
2016-10-11 12:19:38 -04:00
Isaac Connor
ded1e0ea73
handle when window.open fails
2016-10-11 11:48:29 -04:00
Heng Liu
5ea11a8bfe
use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event
...
also fixed bug which prevented seeking in timeline video preview
2015-11-18 21:21:56 -08:00
Isaac Connor
73cc4e5cab
move the window size definitions into a separate file for each css version flat or classic
2015-05-01 16:02:55 -04:00
Andy Bauer
9f3ff787d1
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
Isaac Connor
8d225566b1
Move this line down to mitigate the problem where the console doesn't refresh.
2014-10-20 15:32:30 -04:00
Andrew Bauer
7ea003441d
Merge pull request #371 from m-bene/resizeWindows
...
Reduce window size to exclude task bar area
2014-10-09 14:46:46 -05:00
Jan M. Hochstein
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
Isaac Connor
707f2e84db
increase monitor popup height to fit v4l settings in
2014-08-21 11:14:48 -04:00
Jan M. Hochstein
0a2515c00e
Added basic ONVIF support
2014-07-14 20:36:18 +02:00
m-bene
2881e6b643
focus popup windows
2014-04-26 04:07:33 +02:00
m-bene
9edb55d9af
Modify window size to exclude task bar area
2014-04-07 12:07:29 +02:00
nagyrobi
bc18a27072
Update skin.js
...
Increased popup window sizes just a little bit, to prevent the longer foreign language translated strings to break window layouts.
Fine-tuned again, I hope that's the final one :-)
2013-08-16 10:13:35 +02:00
nextime
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00