56 Commits

Author	SHA1	Message	Date
Isaac Connor	851e8f46ff	redo fix_rotate	2016-04-25 15:57:39 -04:00
Isaac Connor	60642c1fff	Merge branch 'iconnor_video' into storageareas	2016-04-05 12:32:33 -04:00
Isaac Connor	238a25a302	Merge branch 'master' into iconnor_video	2016-04-05 09:38:59 -04:00
Isaac Connor	c9a1a9020d	Merge h264	2016-03-31 11:03:36 -04:00
Isaac Connor	e5a36c02bd	Merge remote-tracking branch 'origin/master' into video_remote	2016-03-30 16:55:24 -04:00
Isaac Connor	b06b82f634	widen filter popup, because storage area name or server name might be longer	2016-03-04 15:35:55 -05:00
SteveGilvarry	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
Isaac Connor	afb0cf2a7e	Merge branch 'master' into storageareas	2016-02-19 11:09:18 -05:00
Dmitry Smirnov	632e9c8e53	Upgrade bundled jQuery (Closes: #1263) ... Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>	2016-02-18 00:28:30 +11:00
SteveGilvarry	7301e803ed	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: src/zm_monitor.cpp src/zm_monitor.h	2016-01-30 15:45:08 +11:00
Isaac Connor	ddf7b1ad43	Merge branch 'master' into storageareas ... Conflicts: web/skins/classic/js/dark.js web/skins/classic/js/flat.js	2016-01-14 09:41:24 -05:00
Isaac Connor	2d86e7713d	increase height of logout popup to fit content	2016-01-08 12:14:01 -05:00
Isaac Connor	492550b5ef	Merge branch 'storageareas' into newpointone ... Conflicts: scripts/zmaudit.pl.in	2015-12-24 12:36:40 -05:00
Isaac Connor	9d8455daea	fix size of filter popups	2015-12-21 15:18:05 -05:00
Isaac Connor	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
Isaac Connor	ca07b951cb	Merge branch 'master' into newpointone ... Conflicts: docs/installationguide/ubuntu.rst	2015-12-21 12:41:25 -05:00
SteveGilvarry	e28e3c2b75	Merge branch 'master' into feature-h264-videostorage	2015-12-20 14:13:30 +11:00
Isaac Connor	a0f8e8be4b	increase width and height of monitors popup to fit new fields	2015-12-18 13:43:16 -05:00
Isaac Connor	ee42174002	Merge branch 'master' into storageareas	2015-12-18 13:42:15 -05:00
Isaac Connor	983d87f69b	increase height and width of groups window to fit buttons in	2015-12-18 13:34:44 -05:00
Isaac Connor	ca45ac23fa	increase height of group edit window	2015-12-18 13:30:42 -05:00
Isaac Connor	3c86965760	Merge branch 'master' into multi-server ... Conflicts: web/skins/classic/js/flat.js	2015-12-04 15:31:30 -05:00
SteveGilvarry	220ee5e516	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2015-11-29 13:17:22 +11:00
Isaac Connor	c2a7e0c587	fix size of monitor popup in flat skin	2015-11-25 15:39:46 -05: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	ea87ffe66f	merge master, bump version to 1.28.108	2015-10-01 11:52:49 -04:00
Isaac Connor	cb18adef5c	increase min height of zone edit popup so that buttons are visible	2015-09-28 13:01:07 -04:00
Isaac Connor	4e2ed00027	widen zone edit popup to fit the image	2015-09-28 12:54:54 -04:00
Isaac Connor	7d52c0b784	widen events popup to fit the thumbnail	2015-09-28 12:44:58 -04:00
Isaac Connor	880e77b096	Merge branch 'master' into multi-server ... Conflicts: src/zm_monitor.cpp src/zm_monitor.h	2015-08-19 13:30:48 -04:00
Isaac Connor	c0517b11ae	Merge branch 'master' into multi-server	2015-08-16 10:52:51 -04:00
Andrew Bauer	1d688be1a1	propagate canEditGroup permission	2015-08-15 13:22:13 -05:00
Robin Daermann	14ebd937c7	Added missing javascript file to Makefile.am	2015-07-27 09:53:59 +02:00
Robin Daermann	5588406570	Add dark CSS for classic view	2015-07-27 09:53:59 +02:00
Isaac Connor	b12d72c68f	fix monitor popup size	2015-07-09 11:44:27 -04:00
Isaac Connor	c8e41319e6	fix state popup dimensions	2015-06-03 12:22:12 -04:00
Isaac Connor	9ecc934927	add the new js files for classic flat skins	2015-05-01 16:50:44 -04: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
Dmitry Smirnov	b2f6bfb5fc	upgrade bundled jQuery (Closes: #785) ... Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>	2015-04-15 11:39:29 +10: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
SteveGilvarry	e87e69fa57	Ran script to replace all Short open tags	2014-12-05 10:44:23 +11: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
Andrew Bauer	805981e06a	Merge remote branch 'nagyrobi/patch-4' into nagyrobi ... Conflicts: web/skins/classic/js/skin.js	2014-02-26 09:04:19 -06:00
Kyle Johnson	1a744ebed6	Added jquery 1.4.2.min.js to the classic skin's js dir	2013-12-17 13:41:36 -05:00