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

194 Commits

Author SHA1 Message Date
Isaac Connor ed5cb2f3ed fix global language problems 2016-05-06 14:58:41 -04:00
Isaac Connor 99d9f98244 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:40:08 -04:00
Isaac Connor 956b971719 put back maxWidtha nd maxHeight 2016-05-06 14:39:48 -04:00
Isaac Connor b3b63ec1d9 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:38:17 -04:00
Isaac Connor 829202b42a move more eventcounting stuff to console.php. 2016-05-06 14:38:08 -04:00
Isaac Connor 01397b6695 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:31:27 -04:00
Isaac Connor 1d673a0b8c move header into a function in functions.php. Move event population into console.php 2016-05-06 14:30:32 -04:00
Isaac Connor 7df2685223 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 12:51:40 -04:00
Isaac Connor e87a35b04d Merge branch 'always_show_ptz' into storageareas 2016-05-06 12:51:15 -04:00
Isaac Connor c9f1614e32 If the camera has no centering control, don't make it look like it does. This also removes a logged error 2016-05-06 12:51:03 -04:00
Isaac Connor d5f1519829 Can't externally reference .js.php, they have to be inline js 2016-05-06 12:40:23 -04:00
Isaac Connor 4defe92911 Merge branch 'master' into updated-console 2016-05-03 14:22:37 -04:00
Isaac Connor 516bacdfd3 Merge branch 'updated-console' into storageareas 2016-05-03 13:38:57 -04:00
Kyle Johnson c2fd3dd84a Also don't load additional JS to Log view 
Another issue with mootools & jquery conflicts
 2016-05-03 13:25:39 -04:00
Kyle Johnson 6768fe5554 Don't include extra js libraries for monitor view. 
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
 2016-05-03 13:06:28 -04: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
Kyle Johnson f2d43de137 Revert "Include Chart.js" 
This reverts commit 33d6d311b0.

Didn't mean to add this code in yet.  For a future feature.
 2016-04-24 00:52:19 -04:00
Kyle Johnson ca0ba4a5f8 Add state view's js and php to all pages as it is now part of header 2016-04-23 22:59:50 -04:00
Isaac Connor 2ff01b6bcb remove unneeded global 2016-04-22 13:36:12 -04:00
Isaac Connor 30b746c603 Add missing ()'s 2016-04-22 13:35:40 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor 564f189416 Merge branch 'always_show_ptz' into storageareas 2016-04-04 16:45:54 -04:00
Isaac Connor 5f3e7134fb split power out of the Panel box so that I can style it better 2016-04-04 13:22:26 -04:00
Isaac Connor 197ae67313 Merge branch 'always_show_ptz' into storageareas 2016-04-04 11:47:29 -04:00
Isaac Connor 2233747fcb add a missing t 2016-04-04 11:38:16 -04:00
Kyle Johnson 33d6d311b0 Include Chart.js 2016-04-02 00:48:58 -04:00
Kyle Johnson 8fdf3291b4 Load jquery and bootstrap js in classic skin 2016-03-16 00:49:51 -04:00
Kyle Johnson d01ef25f82 Update doctype to html5, and add additional meta tags 2016-03-16 00:17:05 -04:00
Kyle Johnson a403c1db8c Move recaptcha javascript to actual <head> tag 
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
 2016-03-12 19:14:07 -05:00
Kyle Johnson c9441ec8c0 Local copy of bootstrap 3.3.6, included in classic skin. 2016-03-12 01:16:19 -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 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
stagecoach 1d77e03622 Updated skins/classic/includes/export_functions.php: 
- time and date stamp in file name of master .html file modified: removed chars (i.e. :) that could trip up some browsers

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3150 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-10-20 18:13:29 +00:00
stagecoach b5146a067c Updated skins/classic/includes/export_functions.php: 
- human-readable time and date stamp in file name of master .html file
- after download to client, master .html file is being removed from server

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3149 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-10-19 21:14:08 +00:00
stagecoach ee50a8c42e Playback functionality embedded into exported jpeg event. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3131 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-09-29 16:19:41 +00:00
stagecoach 2709b3eec6 Stagecoach Wireless Second Test Commit: 
commented string removed from file below to reverse first test commit

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3130 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-09-29 00:57:52 +00:00
stagecoach 80c5c3edb1 Stagecoach Wireless Test Commit: 
commented string, will be removed with second test

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3129 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-09-29 00:55:10 +00:00
stan 9b31bf29e8 Added in image view to allow event root to be able web root 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3031 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-23 09:12:12 +00:00
stan 84e6d5142a Seyi export bug fix. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3020 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-15 17:09:29 +00:00
stan 266e669dde Modified console filters to include archived events and fixed filters for timeline zooming. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2989 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-20 21:36:17 +00:00
stan 6fc7acb378 Changed query separator to &amp; and added CDATA wrapper. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2981 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-16 17:04:44 +00:00
stan e0801bc216 Updated to use mootools 1.2.3 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2978 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-14 17:38:13 +00:00
stan 8cad0dbd6a Updated. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-24 10:27:28 +00:00
stan 11a1cc2d41 Now supports custom perl install path 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-06-08 09:11:56 +00:00
stan 7b4c0fa926 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2820 e3e1d417-86f3-4887-817a-d78f3d33393f 2009-03-27 16:01:59 +00:00
stan cfccc4b9bf Updates to event export and javascript fixes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2814 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-27 09:14:54 +00:00
stan 75c654e654 Downgraded to support autoconf 2.59 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-23 21:59:13 +00:00
stan 3069dc2402 Final timestamp update 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-09 12:45:32 +00:00
stan 429884741a Updated for timestamps 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2801 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-03-09 12:32:04 +00:00
stan e3dce264e0 Fixed issue with exporting. Typo plus over-escaping. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2759 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-12 22:44:37 +00:00
stan e14efbd493 Updated generated files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2726 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-28 11:24:01 +00:00
stan d43d2289ed Changes from updated build tools. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2714 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-01-20 14:54:50 +00:00
stan 549aa39cbb Updated autoconf/make files 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2710 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-06 00:05:56 +00:00
stan 7d96edeacd Added .in files to svn 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2681 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-11-03 12:14:50 +00:00
stan ef8f7b85fd Continuing development and bugfixes 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-26 09:47:20 +00:00
stan 106882c161 Updated copyright notices 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:48:16 +00:00
stan d83525cf76 New paths to mootools and favicon. Reset.css not just screen media. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2557 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-16 13:18:05 +00:00
stan 336ce62c15 Reorganised PTZ controls and layout somewhat 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2553 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-16 13:15:28 +00:00
stan e7c025712a Fixed path to export functions 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2541 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-16 08:41:53 +00:00
stan 2824cb7355 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-14 13:54:50 +00:00