ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,492 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

20 Commits

Author SHA1 Message Date
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
Isaac Connor 7e91053761 increase the hegiht of the window a bit, the contents are larger 2013-09-23 10:03:33 -04:00
Isaac Connor ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00
Kyle Johnson c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04: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
Isaac Connor 3a8481a591 cleanup 2013-05-10 14:02:22 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00