mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-04-28 09:50:58 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,203 Commits 83 Branches 104 Tags
a933d4ae129b634ea3da170a9e857e5933223792
Commit Graph

78 Commits

Author SHA1 Message Date
Andrew Bauer
200f92b1ad make zmexport not rely on symlinks in the webroot (#1888) 
* make zmexport not rely on symlinks in the webroot

* add archive view
 2017-05-17 11:30:39 -04:00
Andrew Bauer
1a565a47f2 fix skin path in export_functions 2017-04-26 12:17:01 -05:00
Isaac Connor
5e0012569f use dos2unix to remove BOM 2017-04-16 09:22:37 -04:00
Isaac Connor
fea5fa1b59 fix xtell should be -1 for move left 2017-01-10 12:35:02 -05:00
Andy Bauer
2dda2d9e1e remove unneeded, empty files 2016-12-26 09:49:14 -06:00
Andy Bauer
254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor
38c0cedecc remove the use of empty which on php < 5.5 only supports variables. 2016-12-20 16:37:42 -05:00
Isaac Connor
02cd3e8cba Merge branch 'master' into small_fixes 2016-11-22 10:52:07 -05:00
Kyle Johnson
3916b02a74 Only load bootstrap css in specific views. 
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
 2016-11-10 23:07:52 -07:00
Kyle Johnson
97fb53e95c Remove extra php tag in functions.php 2016-11-10 21:49:57 -07:00
Kyle Johnson
3e3956f45d Update doctype to HTML5, add meta tags for mobile browsers 2016-11-10 21:47:53 -07:00
Kyle Johnson
eacf6cd415 Restyle login page, move recaptcha js to <head> 
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
 2016-11-10 21:46:55 -07:00
Kyle Johnson
1607ae1210 Load bootstrap css 2016-11-10 21:45:46 -07:00
Isaac Connor
fed575bdb4 add some missing () on class method calls. Remove some no longer needed global 's and some empty lines 2016-04-25 08:56:21 -04: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
f2065e2fcb Merge branch 'one_eighth' into multi-server 2015-12-08 08:47:35 -05:00
Isaac Connor
d6b2e1959f add a 1/8th scale option, which is useful for 1920x1080 streams 2015-12-08 08:40:44 -05:00
Isaac Connor
95f002c7d6 convert monitor hash accesses to function calls 2015-12-01 15:16:53 -05:00
Isaac Connor
ba1100fc03 continue conversion from array to class of Monitor 2015-09-17 16:06:47 -04:00
Isaac Connor
b2699237c7 put back mootools 2015-08-27 11:35:47 -04:00
Isaac Connor
41637278c9 merge master 2015-08-19 16:08:12 -04:00
Andrew Bauer
bf4038a724 followup changes based on comments in #833 2015-05-21 12:23:31 -05:00
Andrew Bauer
3a94712db2 add translate function 2015-05-10 08:10:30 -05:00
Isaac Connor
013009f127 fix the css .js file name 2015-05-01 16:50:29 -04:00
Isaac Connor
91737eb28b also reference a js file with the name of the chosen css. This is so that we can use different popup window sizes for flat because it's text and buttons are so much larger. 2015-05-01 16:03:40 -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
Dmitry Smirnov
d1f00f02c2 skins/classic: fix HTML export with USE_DEEP_STORAGE (Closes: #506). 
Use mygetEventPath() to get valid path.

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-04-04 20:39:06 +11:00
Isaac Connor
fafef86298 Merge branch 'control_improvements' 2014-12-08 16:52:52 -05:00
Isaac Connor
27b9001eb4 default MoveRoot to empty to quiet an error in logs 2014-12-08 16:52:10 -05:00
SteveGilvarry
e87e69fa57 Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
Isaac Connor
53b70d27fb Use the global variable which gets setup in web/index.php to look in a subdirectory of web/skins/classic/css to find the css files. 2014-11-26 11:18:03 -05:00
tim
8ac6ce17bc Fixed issue DateTime handling in filter queries that broke timeline view. 2014-06-15 13:05:25 -07:00
Isaac Connor
967dda737c more copying mysql2PDO from classic. Also, some fixes in classic 2014-03-21 17:16:56 -04:00
Isaac Connor
ffa952419c Merge branch 'mysql2PDO' 
Conflicts:
	distros/ubuntu1204/changelog
	scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
	web/includes/actions.php
 2014-03-20 16:48:03 -04:00
Adam J. Henry
e6b9b8218b Enclose value of the Notes attribute with quotes. 2013-12-31 17:32:20 -06:00
Kyle Johnson
cad33ddb96 Removed embedded jquery, instead include by <script>. Fixes #274 2013-12-17 13:41:55 -05:00
Isaac Connor
3393a63525 more updates 2013-12-17 12:53:15 -05: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
Isaac Connor
a468baf9eb cleanup 2013-05-10 13:55:45 -04:00
Kyle Johnson
2c04d0774f Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
Kyle Johnson
1ed6462354 Removed all of the old web files 2013-05-01 06:52:43 -04:00
stan
4996dd0a51 Recreated generated files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:46:18 +00:00
stan
3a399378b2 Fixed problem with link to overlay css file 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3485 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-07-27 16:09:09 +00:00
stan
6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan
8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 21:59:06 +00:00
stan
46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-07 11:10:18 +00:00
stan
dc9e2755b0 Added sample apache config file. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-03 23:27:58 +00:00
stan
7e1979760e Updated with new bandwidth based stream config 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3166 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 16:36:03 +00:00
stan
70aee2ad56 Regenerated 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3160 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 15:50:41 +00:00