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

466 Commits

Author SHA1 Message Date
Isaac Connor 02ee745167 parameter to defined should be in quotes 2015-07-17 10:09:22 -04:00
root 560a4cccbe Show correct part of URL (hostname) for ffmpeg sources in console 2015-07-17 13:59:40 +02:00
Isaac Connor ace8597b8d Merge branch 'master' into multi-server 2015-07-14 16:10:51 -04:00
Isaac Connor 04366e752a add Servers to options, a server editing popup and a server selection to monitors 2015-07-09 11:41:46 -04:00
Andy Bauer 1aebbec4e8 Merge branch '898-isRunning-States' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-898-isRunning-States 
Conflicts:
	db/zm_create.sql.in
	db/zm_update-1.28.99.sql
 2015-06-27 16:32:32 -05:00
Andrew Bauer 592ecd8e94 fix montage view issue in mobile skin 2015-06-26 08:47:20 -05:00
Pliable Pixels 1a0d4d2221 Console now shows custom run state in header (if applicable) 2015-06-21 09:31:21 -04:00
Isaac Connor c8e41319e6 fix state popup dimensions 2015-06-03 12:22:12 -04:00
Isaac Connor f99c5f3627 use correct tag for the frame popup so that it gets the correct popup window size 2015-06-03 12:09:38 -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
Andrew Bauer 8a1625463c Merge pull request #823 from ZoneMinder/fix_session_concurrency 
close the session before requiring the page contents to fix the concurre...
 2015-05-09 17:50:18 -05:00
Isaac Connor 9ecc934927 add the new js files for classic flat skins 2015-05-01 16:50:44 -04: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
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
Isaac Connor 01af58018b close the session before requiring the page contents to fix the concurrency issue that exists due to using the file-backed session. 2015-04-20 13:06:34 -04:00
Emmanuel Papin 81eaf44595 Fix a bad SLANG key in monitor.php 2015-04-18 19:37:56 +02:00
Emmanuel Papin 216348274b Remove a remaining hardcoded string 2015-04-18 18:14:36 +02:00
Emmanuel Papin ac8ace33f8 Remove hardcoded localized strings and update lang files 2015-04-18 17:14:14 +02: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
SteveGilvarry 98d91ded90 Found some introduced short tags 2015-04-08 20:13:27 +10:00
SteveGilvarry 45fd7f1eca Found some old open tags left over 2015-04-08 20:11:26 +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 1a17c820f2 Merge pull request #730 from ljack/master 
Fix image and css import paths for style/skin named "flat"
 2015-02-25 11:51:42 -05:00
ljack e9384d445a fix .upBtn and .downBtn also for "flat" css 2015-02-25 18:10:40 +02:00
ljack 8616fdb33d fix import path 2015-02-25 18:09:23 +02:00
ljack 6233432559 fix import path 2015-02-25 18:08:41 +02:00
ljack 48950f3f1c Update control.css 
Update paths for .upBtn and .downBtn too
 2015-02-25 09:24:19 +02:00
Isaac Connor 362153cb3a Also fix video.pho which has the same problem. 2015-02-23 14:34:13 -05:00
Isaac Connor bff26154b0 Also fix video.pho which has the same problem. 2015-02-23 14:31:15 -05:00
Isaac Connor c9f109bc27 also fix timeline which has the same problem 2015-02-23 14:27:35 -05:00
Isaac Connor dd714665bd use explode instead of preg_split 2015-02-23 14:18:10 -05:00
Isaac Connor bd3a9806b8 Fix sql query when user is limited to specific monitors 2015-02-23 14:16:04 -05:00
Isaac Connor 851a246cf2 Revert "Fix sql query when user is limited to specific monitors" 
This reverts commit 41b581552e.
 2015-02-23 14:10:53 -05:00
Isaac Connor 41b581552e Fix sql query when user is limited to specific monitors 2015-02-23 14:10:18 -05:00
Isaac Connor 9b0c8085eb Merge pull request #720 from knnniggett/zmonvif 
Don't show ONVIf probe link when ONVIF support is not enabled
 2015-02-21 15:50:07 -05:00
Andrew Bauer 7ef503ff59 User configurable arp tool 2015-02-21 13:08:04 -06:00
Andrew Bauer b000b997e9 Merge pull request #709 from ZoneMinder/find_arp 
try harder to find arp.
 2015-02-21 11:53:26 -06:00
Andrew Bauer 4182fb3295 Don't show ONVIf probe link when ONVIF support is not enabled 2015-02-21 11:12:07 -06:00
Isaac Connor 438456ce93 include output if can't find arp 2015-02-19 15:43:34 -05:00
Isaac Connor c3f96ad8ca fix path to the zone point gif 2015-02-19 11:11:01 -05: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
Isaac Connor 13c6be548d If type -p doesn't work, try which, and if that doesn't work just try /usr/sbin/arp. Also don't bother with escapeshellcmd because these are not user inputs. 2015-02-17 15:39:59 -05:00
Isaac Connor 2b00ebd02c if path results in an empty string, set it to something so that the link is there when type is vlc 2015-02-03 10:52:49 -05:00
Isaac Connor bf688f2d39 trival quoting changes and missing semi colons 2015-02-02 19:06:45 -05:00
Isaac Connor 690a2f083e fix montage layout broken by my skin merging 2015-02-02 19:06:20 -05:00
Isaac Connor 2328ae8792 remove 50% width so that header auto-fits 2015-01-28 14:05:29 -05:00
Steve Gilvarry a44f83cb7d #658 Fix error message for finding arp path 2015-01-05 07:58:39 +11:00
Isaac Connor ddae55a1c9 Merge pull request #645 from ZoneMinder/skin_css_default 
Skin css default
 2014-12-29 12:00:44 -05:00