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

4718 Commits

Author SHA1 Message Date
Isaac Connor 8eb5e53aad Remove with {ZM_PATH_SWAP} 2015-05-14 10:27:11 -04:00
Andrew Bauer 691fbbb0a6 Update README.md 2015-05-14 09:06:42 -05:00
Isaac Connor 3709ac411d Not having ZM_AUDIT_MIN_AGE should be fatal 2015-05-13 12:36:35 -04:00
Isaac Connor 950cd06535 Revert "Revert "Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting"" 
This reverts commit 9c73b7247c.
 2015-05-13 11:38:55 -04:00
Isaac Connor 9c73b7247c Revert "Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting" 
This reverts commit a5fed03524.
 2015-05-13 11:37:13 -04:00
Isaac Connor a5fed03524 Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting 2015-05-13 11:33:22 -04:00
Andrew Bauer da3a4e1ca0 Merge pull request #836 from ZoneMinder/FI9821W_Y2k 
Update to FI982821W_Y2k
 2015-05-13 08:13:01 -05:00
Isaac Connor 246fadb097 support the old use of just putting the password in the control field 2015-05-13 08:23:16 -04:00
Isaac Connor e8114c90bb Fix printMsg. We don't use it as an object method. Update to parse a user:password out of ControlAddress which is what a lot of other scripts do. 2015-05-12 17:08:55 -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 5ded77f8de Merge pull request #825 from rwg0/688-fix-fast-forward 
Fix fast forward/reverse in event playback (#688)
 2015-05-09 19:39:23 -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
Andrew Bauer c7a50a7cbc Replace newlines with a space 2015-05-09 12:13:38 -05:00
Andrew Bauer c7c0622673 rpmbuild incorrectly interprets the text "use standard" as a Perl module dependency. 2015-05-09 12:10:12 -05:00
Isaac Connor 79398a2bec Merge pull request #821 from onlyjob/PBP 
beautifying *.pm
 2015-05-08 08:56:01 -04:00
Andrew Bauer 5add4422f2 Merge pull request #822 from ZoneMinder/fix_kFreeBSD 
Fix build issues on kFreeBSD. Fixes #771
 2015-05-08 06:38:24 -05:00
Andrew Bauer e127228233 Update zoneminder.el7.spec 
some documentation was not being packaged and neither was the selinux policy file
 2015-05-07 18:13:33 -05:00
Andrew Bauer cbbe40ea1c Update zoneminder.el7.spec 
Recent perl changes place the .packlist file under a different folder on CentOS 7
 2015-05-07 17:56:04 -05:00
Andrew Bauer 2f0659a612 Merge pull request #829 from ZoneMinder/separate_css_window_sizes 
Separate css window sizes
 2015-05-01 17:28:04 -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 ea795c4040 Fix to compile on 32bit kFreeBSD 2015-04-24 13:55:10 -04:00
rwg0 422020a3b2 Fix fast forward/reverse in event playback not being fast if effectivefps < maxfps 2015-04-22 22:11:33 +01:00
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