mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-20 23:02:08 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,471 Commits 80 Branches 104 Tags
73cc4e5cab74fbfb91e7eff7649244eae3a4f6fa
Commit Graph

1586 Commits

Author SHA1 Message Date
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
Lihis
0e7fa89dd1 Fix: typo in options_libvlc 
Fixed typo in the OPTIONS_LIBVLC help.
 2015-04-22 15:26:33 +03:00
Emmanuel Papin
81eaf44595 Fix a bad SLANG key in monitor.php 2015-04-18 19:37:56 +02:00
Emmanuel Papin
e92fb40c84 Set date and time format in french lang file 2015-04-18 19:08:03 +02:00
Emmanuel Papin
216348274b Remove a remaining hardcoded string 2015-04-18 18:14:36 +02:00
Emmanuel Papin
955237d6ac Translate new strings in french file 2015-04-18 17:51:08 +02:00
Emmanuel Papin
ac8ace33f8 Remove hardcoded localized strings and update lang files 2015-04-18 17:14:14 +02:00
Emmanuel Papin
5d0d5dadc7 Fix translations after first review 2015-04-17 22:58:51 +02:00
Emmanuel Papin
0f09dddf9c Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into fix_french_lang_file 2015-04-16 22:38:25 +02:00
Emmanuel Papin
1674675da4 Translation of a bunch of english text 2015-04-16 22:32:47 +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
Emmanuel Papin
039cf09da9 Fix bad translations (first checking before tests) 2015-03-30 21:16:33 +02:00
Emmanuel Papin
c0b41ed6a8 Readd translations from Jypy 2015-03-30 20:50:42 +02:00
Emmanuel Papin
ca041a3ce5 Revert "Update fr_fr.php" 
This reverts commit 3b9c3f0776.
 2015-03-30 20:06:59 +02:00
Andrew Bauer
20107ac1e6 remove NETPBM dependency from autotools 2015-03-01 10:51:04 -06: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
Jean-Philippe Bouillot
3b9c3f0776 Update fr_fr.php 2015-02-20 12:30:33 +01:00
Isaac Connor
0af7d0cc0b check defined(ZM_DEFAULT_SKIN) otherwise php will turn it into a string 2015-02-19 16:04:06 -05:00
Isaac Connor
b159f6ce9e Fatal->Error since Fatal is fatal 2015-02-19 15:57:37 -05:00
Isaac Connor
438456ce93 include output if can't find arp 2015-02-19 15:43:34 -05:00
Isaac Connor
8eb8cacd56 Check to make sure that skin and css are valid. 2015-02-19 14:17:33 -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
2b53e439b9 Add Capture Resolution to replace Capture Width and Capture Height 2015-02-11 13:14:51 -05:00
Andrew Bauer
8657d0a243 Merge pull request #696 from ZoneMinder/improve_deleteEvent 
Improve delete event
 2015-02-09 07:15:27 -06:00
Isaac Connor
4524a61a50 prevent error message in log when Enabled is not checked 2015-02-06 14:15:26 -05:00
Isaac Connor
fed6748c6d fixes to format date into zero padding and year as 2 digit 2015-02-06 13:00:55 -05:00
Isaac Connor
dbac099223 we don't use EndTime so don't load it 2015-02-06 11:50:23 -05:00
Isaac Connor
bcdac0104f pass a minimum event hash instead of the event id to deleteEvent 2015-02-06 11:50:07 -05:00
Isaac Connor
9a1e210849 add comment 2015-02-06 11:46:35 -05:00
Isaac Connor
02a6c78182 make deleteEvent take either an event object or an eid. 
load the relevant event data if passed an eid.
Use the StartTime to get to the event files instead of globbing the entire events path under the monitor.
 2015-02-06 11:41:37 -05:00