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

1689 Commits

Author SHA1 Message Date
Emmanuel Papin 132e0a1798 Add analysis fps paramter to monitors 2015-07-22 21:38:35 +02:00
Emmanuel Papin a6b7c6e99f Add analysis interval parameter to monitors 2015-07-21 22:52:52 +02:00
Pliable Pixels e332fc36a9 Fixed Configs API to return all values 2015-07-21 13:28:37 -04:00
Andrew Bauer 500b560884 Merge pull request #952 from schrorg/583-correct-de_de-encoding 
Change encoding of german language file to UTF-8
 2015-07-20 08:07:30 -05:00
Isaac Connor 02ee745167 parameter to defined should be in quotes 2015-07-17 10:09:22 -04:00
root a9df82256b Change encoding of web/lang/de_de.php from ISO-8859-1 to UTF-8 2015-07-17 14:24:46 +02: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
Pliable Pixels 444d978c81 Added API routing 2015-07-13 18:55:28 +00: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
Isaac Connor 42ac3ceb3b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-07-09 11:00:05 -04:00
Isaac Connor 51631b84b4 cleanup generated files 2015-07-09 10:59:45 -04:00
Andrew Bauer 8406818b00 Merge pull request #921 from pliablepixels/master 
Added "RewriteBase /zm/api" for API routing
 2015-07-05 08:34:28 -05:00
Pliable Pixels 3a9c941213 Added "RewriteBase /zm/api" for API routing 2015-07-05 08:59:07 -04:00
Andrew Bauer 1b2f214340 Dumb down Crud from 4.0 -> 3.0.10 2015-06-30 10:26:29 -05: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
Isaac Connor 4be341986f Merge pull request #897 from pliablepixels/881-api-branch 
Fixed events API to remove thumbnail code
 2015-06-22 13:01:15 -04:00
Pliable Pixels 1a0d4d2221 Console now shows custom run state in header (if applicable) 2015-06-21 09:31:21 -04:00
Pliable Pixels 719a903d43 Fixed events API to remove thumbnail code 2015-06-20 20:08:10 -04:00
Pliable Pixels 138e931e24 Fixed events API to remove thumbnail code 2015-06-20 19:57:55 -04:00
Andrew Bauer 8d309fbd6e Merge pull request #874 from seeebek/master 
German translation update
 2015-06-19 13:50:55 +02:00
pliablepixels 7112001b64 getVersion.json now returns both ZM version and API version 2015-06-13 16:33:15 +00:00
pliablepixels 12ba217de0 Added API version in addition to ZM version, also added loadConfig code that was there in the angular-ui branch but not merged to master 2015-06-13 16:32:37 +00:00
Isaac Connor bda35ed4d6 fix bootstrap.ini substitution 2015-06-12 11:12:58 -04:00
Isaac Connor ecb7720056 Merge pull request #882 from pliablepixels/881-merge-angularui-apis 
Merged Angular UI branch API to master
 2015-06-12 11:06:59 -04:00
Andrew Bauer d915d859ed Convert Crud to submodule 2015-06-11 11:56:39 -05:00
Ubuntu dd9603f70f Merged Angular UI branch API to master 2015-06-11 02:58:58 +00:00
Sebastian Kaminski f3a8217651 resolve conflicts from merge by seebaer1976 2015-06-05 19:34:52 +02:00
Isaac Connor e10fdaf344 reduce the wait to 2/10ths instead of a whole second 2015-06-05 11:49:05 -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
seebaer1976 4cf1e61197 Update de_de.php 2015-05-31 17:43:21 +02:00
Sebastian Kaminski ba980ae4ae update german translation 2015-05-27 15:38:47 +02:00
Andrew Bauer bf4038a724 followup changes based on comments in #833 2015-05-21 12:23:31 -05:00
Isaac Connor 5876186909 Merge pull request #803 from knnniggett/mootools 
Update Mootools
 2015-05-21 13:15:13 -04:00
Isaac Connor b7890ec923 Merge pull request #833 from knnniggett/slang 
add translate function
 2015-05-21 13:14:44 -04:00
Isaac Connor 82f5ab5175 Fix use of DEFINED. It takes a string not a constant. When COOKIE is not set or has changed, set it 2015-05-11 16:22:14 -04: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
Andrew Bauer 69ccd53653 rollback mootools-core to 1.4.5-compat 2015-05-09 17:23:01 -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
Lihis 0e7fa89dd1 Fix: typo in options_libvlc 
Fixed typo in the OPTIONS_LIBVLC help.
 2015-04-22 15:26:33 +03: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 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
Andrew Bauer 38f6eb8b5f Update mootools to 1.5.1 2015-04-12 17:52:01 -05: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
seebaer1976 750420d42f Update de_de.php 2015-04-05 09:52:34 +02:00
seebaer1976 35ba2a2107 Update de_de.php 2015-04-05 09:03:41 +02:00
seebaer1976 2522537184 Update de_de.php 2015-04-04 22:38:12 +02:00
seebaer1976 4aa9b0e802 Update de_de.php 2015-04-04 18:03:25 +02: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
seebaer1976 da48b0ea4a Update de_de.php 2015-04-04 09:21:43 +02:00
seebaer1976 5c35bc5acb Update de_de.php 2015-04-03 21:04:24 +02:00
seebaer1976 2a3fdf3695 Update de_de.php 2015-04-03 19:12:15 +02: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