ded1e0ea73
handle when window.open fails
2016-10-11 11:48:29 -04:00
5ff427d9e9
Removed Autotools Makefile.am
...
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
632e9c8e53
Upgrade bundled jQuery ( Closes : #1263 )
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-18 00:28:30 +11:00
2d86e7713d
increase height of logout popup to fit content
2016-01-08 12:14:01 -05:00
dfd7986c01
Merge branch 'master' into multi-server
...
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
983d87f69b
increase height and width of groups window to fit buttons in
2015-12-18 13:34:44 -05:00
ca45ac23fa
increase height of group edit window
2015-12-18 13:30:42 -05:00
3c86965760
Merge branch 'master' into multi-server
...
Conflicts:
web/skins/classic/js/flat.js
2015-12-04 15:31:30 -05:00
c2a7e0c587
fix size of monitor popup in flat skin
2015-11-25 15:39:46 -05:00
ea87ffe66f
merge master, bump version to 1.28.108
2015-10-01 11:52:49 -04:00
cb18adef5c
increase min height of zone edit popup so that buttons are visible
2015-09-28 13:01:07 -04:00
4e2ed00027
widen zone edit popup to fit the image
2015-09-28 12:54:54 -04:00
7d52c0b784
widen events popup to fit the thumbnail
2015-09-28 12:44:58 -04:00
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
c0517b11ae
Merge branch 'master' into multi-server
2015-08-16 10:52:51 -04:00
1d688be1a1
propagate canEditGroup permission
2015-08-15 13:22:13 -05:00
14ebd937c7
Added missing javascript file to Makefile.am
2015-07-27 09:53:59 +02:00
5588406570
Add dark CSS for classic view
2015-07-27 09:53:59 +02:00
b12d72c68f
fix monitor popup size
2015-07-09 11:44:27 -04:00
c8e41319e6
fix state popup dimensions
2015-06-03 12:22:12 -04:00
9ecc934927
add the new js files for classic flat skins
2015-05-01 16:50:44 -04:00
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
b2f6bfb5fc
upgrade bundled jQuery ( Closes : #785 )
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-15 11:39:29 +10:00
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
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
8d225566b1
Move this line down to mitigate the problem where the console doesn't refresh.
2014-10-20 15:32:30 -04:00
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
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
707f2e84db
increase monitor popup height to fit v4l settings in
2014-08-21 11:14:48 -04:00
0a2515c00e
Added basic ONVIF support
2014-07-14 20:36:18 +02:00
2881e6b643
focus popup windows
2014-04-26 04:07:33 +02:00
9edb55d9af
Modify window size to exclude task bar area
2014-04-07 12:07:29 +02:00
805981e06a
Merge remote branch 'nagyrobi/patch-4' into nagyrobi
...
Conflicts:
web/skins/classic/js/skin.js
2014-02-26 09:04:19 -06:00
1a744ebed6
Added jquery 1.4.2.min.js to the classic skin's js dir
2013-12-17 13:41:36 -05:00
7e91053761
increase the hegiht of the window a bit, the contents are larger
2013-09-23 10:03:33 -04:00
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
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
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
Isaac Connor
SteveGilvarry
Dmitry Smirnov
Andrew Bauer
Robin Daermann
Andy Bauer
SteveGilvarry
Jan M. Hochstein
m-bene
Kyle Johnson
Isaac Connor
Isaac Connor
nagyrobi
nextime