Andrew Bauer
8d0bdc4cf1
Merge pull request #842 from whorfin/master
...
Port to OmniOS/Solaris
2015-05-19 08:35:22 -05:00
Andrew Bauer
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
SteveGilvarry
d96c952047
Merge branch 'master' into Cmakelists_CleanUp
...
Conflicts:
CMakeLists.txt
2015-05-19 21:12:34 +10:00
Rick Sayre
334584d37f
exactly rollback web/includes/config.php.in
2015-05-18 22:01:59 -07:00
Rick Sayre
8c7e633d8f
Undo ZM_VERSION changes
2015-05-18 21:55:00 -07:00
Rick Sayre
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
Rick Sayre
fb5c1abc87
Undid ZM_VERSION hacks
2015-05-18 21:44:41 -07:00
Andrew Bauer
f638b077fc
Update README.md
2015-05-18 16:58:11 -05:00
Rick Sayre
b52b7ea89b
Added OmniOS/Solaris info
2015-05-17 17:34:52 -07:00
Rick Sayre
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
Andrew Bauer
ea7c1f6883
Update README.md
2015-05-17 16:34:08 -05:00
Andrew Bauer
b65d08b445
Update README.md
...
typo
2015-05-17 16:21:22 -05:00
Andrew Bauer
9bd4fa6c8a
Update README.md
2015-05-17 16:20:37 -05:00
Andrew Bauer
466c6d9dd8
Update README.md
2015-05-17 15:35:49 -05:00
Andrew Bauer
8545f30d72
Update README.md
...
typo
2015-05-17 15:30:07 -05:00
Andrew Bauer
9d4916ad49
Update README.md
2015-05-17 15:27:46 -05:00
Andrew Bauer
3c5e05d1f4
Update README.md
2015-05-17 15:24:35 -05:00
Andrew Bauer
04f698824f
Update README.md
2015-05-17 15:23:14 -05:00
Andrew Bauer
134b6b1dbb
Update README.md
2015-05-17 15:22:02 -05:00
Andrew Bauer
d8cd6abc06
Update README.md
...
One of may commits to update build instructions for Redhat based distros
2015-05-17 15:00:39 -05:00
Emmanuel Papin
0135b90cf6
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
2015-05-16 08:09:48 +02:00
Emmanuel Papin
eb9e01eb00
Increase height of plugin window
2015-05-16 07:36:08 +02:00
Emmanuel Papin
2b770b2f58
Add an error message if plugin option is not valid
2015-05-16 06:12:38 +02:00
Emmanuel Papin
0241f844d2
Add space in array formatting
2015-05-15 08:11:51 +02:00
Emmanuel Papin
775da60382
Remove any call to ['Name']
2015-05-14 20:49:36 +02:00
Andrew Bauer
a03f3f39b5
Update README.md
...
Better http link formatting
2015-05-14 10:06:16 -05:00
Andrew Bauer
a1ca1a8af5
Update README.md
2015-05-14 10:02:35 -05:00
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
Emmanuel Papin
7766ec4c72
Rename debian dev package
2015-05-14 14:10:46 +02:00
Emmanuel Papin
676968ed04
Add list option for plugins
2015-05-14 11:38:38 +02:00
Emmanuel Papin
6b2c435460
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support_list
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
2015-05-14 11:12:38 +02: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