47012c58de
Check the Host OS, similar to configure.ac
2015-05-20 17:20:44 -05:00
8d0bdc4cf1
Merge pull request #842 from whorfin/master
...
Port to OmniOS/Solaris
2015-05-19 08:35:22 -05:00
2549865c63
Merge pull request #812 from SteveGilvarry/Cmakelists_CleanUp
...
Fixes #760 in part Clean up CMakeLists.txt
2015-05-19 08:09:08 -05:00
d96c952047
Merge branch 'master' into Cmakelists_CleanUp
...
Conflicts:
CMakeLists.txt
2015-05-19 21:12:34 +10:00
334584d37f
exactly rollback web/includes/config.php.in
2015-05-18 22:01:59 -07:00
8c7e633d8f
Undo ZM_VERSION changes
2015-05-18 21:55:00 -07:00
ffe46978d2
Undid PATH change, needed for mysqldump; which I see is indeed called
...
many other places with incorrect paths.
Make macros should be setting all this up correctly!
mysqldump is [for example] in /opt/local/bin, not /usr/bin, with pkgin
2015-05-18 21:49:08 -07:00
fb5c1abc87
Undid ZM_VERSION hacks
2015-05-18 21:44:41 -07:00
f638b077fc
Update README.md
2015-05-18 16:58:11 -05:00
b52b7ea89b
Added OmniOS/Solaris info
2015-05-17 17:34:52 -07:00
12516da3dc
Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
...
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
ea7c1f6883
Update README.md
2015-05-17 16:34:08 -05:00
b65d08b445
Update README.md
...
typo
2015-05-17 16:21:22 -05:00
9bd4fa6c8a
Update README.md
2015-05-17 16:20:37 -05:00
466c6d9dd8
Update README.md
2015-05-17 15:35:49 -05:00
8545f30d72
Update README.md
...
typo
2015-05-17 15:30:07 -05:00
9d4916ad49
Update README.md
2015-05-17 15:27:46 -05:00
3c5e05d1f4
Update README.md
2015-05-17 15:24:35 -05:00
04f698824f
Update README.md
2015-05-17 15:23:14 -05:00
134b6b1dbb
Update README.md
2015-05-17 15:22:02 -05:00
d8cd6abc06
Update README.md
...
One of may commits to update build instructions for Redhat based distros
2015-05-17 15:00:39 -05:00
a03f3f39b5
Update README.md
...
Better http link formatting
2015-05-14 10:06:16 -05:00
a1ca1a8af5
Update README.md
2015-05-14 10:02:35 -05:00
691fbbb0a6
Update README.md
2015-05-14 09:06:42 -05:00
da3a4e1ca0
Merge pull request #836 from ZoneMinder/FI9821W_Y2k
...
Update to FI982821W_Y2k
2015-05-13 08:13:01 -05:00
246fadb097
support the old use of just putting the password in the control field
2015-05-13 08:23:16 -04:00
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
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
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
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
c7a50a7cbc
Replace newlines with a space
2015-05-09 12:13:38 -05:00
c7c0622673
rpmbuild incorrectly interprets the text "use standard" as a Perl module dependency.
2015-05-09 12:10:12 -05:00
79398a2bec
Merge pull request #821 from onlyjob/PBP
...
beautifying *.pm
2015-05-08 08:56:01 -04:00
5add4422f2
Merge pull request #822 from ZoneMinder/fix_kFreeBSD
...
Fix build issues on kFreeBSD. Fixes #771
2015-05-08 06:38:24 -05:00
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
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
2f0659a612
Merge pull request #829 from ZoneMinder/separate_css_window_sizes
...
Separate css window sizes
2015-05-01 17:28:04 -05:00
9ecc934927
add the new js files for classic flat skins
2015-05-01 16:50:44 -04:00
013009f127
fix the css .js file name
2015-05-01 16:50:29 -04:00
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
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
ea795c4040
Fix to compile on 32bit kFreeBSD
2015-04-24 13:55:10 -04:00
422020a3b2
Fix fast forward/reverse in event playback not being fast if effectivefps < maxfps
2015-04-22 22:11:33 +01:00
d18ec50189
Merge pull request #824 from Lihis/patch-1
...
Fix: typo in options_libvlc
2015-04-22 07:35:44 -05:00
0e7fa89dd1
Fix: typo in options_libvlc
...
Fixed typo in the OPTIONS_LIBVLC help.
2015-04-22 15:26:33 +03:00
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
209f23cc6e
Fix build issues on kFreeBSD. Fixes #771
2015-04-20 12:53:02 -04:00
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
eddada011c
spelling corrections (thanks, /usr/bin/codespell)
2015-04-19 20:38:23 +10:00
abc8d3fdd1
ConfigData.pm: wrap extraordinary long lines using new "qqq()" function.
2015-04-19 18:15:51 +10:00
Andrew Bauer
Andrew Bauer
SteveGilvarry
Rick Sayre
Isaac Connor
Isaac Connor
Isaac Connor
rwg0
Lihis
Isaac Connor
Dmitry Smirnov