Commit Graph

4841 Commits

Author SHA1 Message Date
Andrew Bauer d18ec50189 Merge pull request #824 from Lihis/patch-1
Fix: typo in options_libvlc
2015-04-22 07:35:44 -05: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
Isaac Connor 209f23cc6e Fix build issues on kFreeBSD. Fixes #771 2015-04-20 12:53:02 -04:00
Isaac Connor 018abe6039 Merge pull request #820 from manupap1/fix_localization
Remove hardcoded localized strings in php files and update lang files
2015-04-20 12:37:14 -04:00
Dmitry Smirnov eddada011c spelling corrections (thanks, /usr/bin/codespell) 2015-04-19 20:38:23 +10:00
Dmitry Smirnov abc8d3fdd1 ConfigData.pm: wrap extraordinary long lines using new "qqq()" function. 2015-04-19 18:15:51 +10:00
Dmitry Smirnov 458ed9ede9 ZoneMinder.pm: minor re-wrapping 2015-04-19 18:15:23 +10:00
Dmitry Smirnov 62c1429039 wrap long lines 2015-04-19 16:31:53 +10:00
Dmitry Smirnov 6a150d2607 tabs-to-spaces 2015-04-19 15:17:10 +10: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
Andrew Bauer 620743da5e Merge pull request #818 from manupap1/fix_french_lang_file
Fix french lang file
2015-04-17 18:15:02 -05:00
Emmanuel Papin cde864bf65 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into fix_french_lang_file 2015-04-17 23:00:47 +02:00
Emmanuel Papin 5d0d5dadc7 Fix translations after first review 2015-04-17 22:58:51 +02:00
Andrew Bauer d5e403b7e0 Merge pull request #775 from ZoneMinder/freebsd_fixes
Freebsd fixes
2015-04-17 15:21:42 -05:00
Andrew Bauer 3261d974f7 Merge pull request #816 from onlyjob/PBP
more perlcritic/PBP corrections
2015-04-16 20:26:35 -05:00
Dmitry Smirnov 85d75b0b27 Logger.pm: define '$LOGFILE'
non-bareword LOGFILE should be defined.
2015-04-17 11:15:49 +10:00
Dmitry Smirnov 59b63188cb eliminating {Two-argument "open"}/{Bareword file handle}. See pages 202,204 of PBP. (Severity: 5) 2015-04-17 09:33:06 +10:00
Dmitry Smirnov 3d512dbada eliminate Subroutine prototypes 2015-04-17 09:22:47 +10:00
Dmitry Smirnov f02b9c94ec PelcoP.pm: correct package declaration (thanks, perlcritic)
Package declaration must match filename at line 25, column 1.  Correct the filename or package statement.  (Severity: 5)
2015-04-17 08:24:01 +10: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
Isaac Connor e69fee1c94 Merge pull request #815 from onlyjob/PBP
last batch of POD and readability conversions for *.pl scripts
2015-04-16 11:53:19 -04:00
Dmitry Smirnov b0909a4c57 autouse Data::Dumper 2015-04-16 15:48:51 +10:00
Dmitry Smirnov b0d98c6052 zmx10.pl: pod2usage + readability 2015-04-16 15:48:50 +10:00
Dmitry Smirnov 14f3c106fe zmwatch.pl: comments to POD + readability 2015-04-16 15:48:49 +10:00
Dmitry Smirnov 7ba03132fc zmvideo.pl: pod2usage + readability 2015-04-16 15:48:48 +10:00
Dmitry Smirnov fcdd9b6fb5 zmtrigger.pl: comments to POD + readability 2015-04-16 15:48:47 +10:00
Dmitry Smirnov 60b355cb92 zmtrack.pl: pod2usage + readability 2015-04-16 15:48:36 +10:00
Isaac Connor 0c0a23bf86 Merge pull request #778 from onlyjob/build-hurd
build: add PATH_MAX definitions (needed on GNU Hurd)
2015-04-16 01:00:00 -04:00
Dmitry Smirnov 6f3baca5cd zmsystemctl.pl: pod2usage 2015-04-16 14:38:27 +10:00
Dmitry Smirnov b3b9647740 zm.in: tabs-to-spaces 2015-04-16 14:26:31 +10:00
Dmitry Smirnov 0a2f1cd2b6 build: add PATH_MAX definitions (needed on GNU Hurd)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-16 11:25:04 +10:00
Andrew Bauer fc64e3f01b Merge pull request #772 from balr0g/linked-cameras-trigger-on-new-events
Don't trigger linked cameras on new events
2015-04-15 20:23:54 -05:00
Isaac Connor 1668949f18 Merge pull request #792 from knnniggett/perl
cmake - use perl INSTALLDIRS
2015-04-15 11:07:14 -04:00
Andrew Bauer 91832e575d Merge pull request #809 from onlyjob/jquery
upgrade bundled jQuery (Closes: #785)
2015-04-15 07:30:27 -05:00
SteveGilvarry 14cf1bcae6 Clean up CMakeLists.txt, wrap lines, remove comments from initial commit, update comments. No functionality changes 2015-04-15 22:09:25 +10: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
Isaac Connor c17d156d95 Merge pull request #798 from onlyjob/PBP
zmcontrol.pl, zmfilter.pl: pod2usage + readability improvements.
2015-04-13 10:19:59 -04:00
Isaac Connor e1ef19f470 Merge pull request #802 from knnniggett/deep_storage
hide USE_DEEP_STORAGE
2015-04-13 10:17:03 -04:00
Andrew Bauer 38f6eb8b5f Update mootools to 1.5.1 2015-04-12 17:52:01 -05:00
Andrew Bauer 30765fdedf hide USE_DEEP_STORAGE 2015-04-12 12:20:20 -05:00
Andrew Bauer e4cf323949 Merge pull request #800 from Sune1337/pthread_join
* use pthread_join instead of pthread_tryjoin_np
2015-04-12 11:51:50 -05:00
Andrew Bauer 4cb8cf8681 remove commented commands 2015-04-12 11:48:49 -05:00
Andrew Bauer 3a3f186e74 update working_directory 2015-04-12 11:48:18 -05:00
Andrew Bauer 8f337999d4 remove nph-zms target 2015-04-12 11:47:28 -05:00