Commit Graph

21 Commits

Author SHA1 Message Date
Isaac Connor 851e8f46ff redo fix_rotate 2016-04-25 15:57:39 -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
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
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
Isaac Connor c2a7e0c587 fix size of monitor popup in flat skin 2015-11-25 15:39:46 -05: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 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 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