Isaac Connor
|
b8f2b1e0a0
|
Merge branch 'mmap_fd_gt_3' into multi-server
|
2015-09-16 11:01:06 -04:00 |
|
Isaac Connor
|
d991912ce4
|
Merge branch 'fix_privacy_mask_segfaults' into multi-server
|
2015-09-16 11:00:57 -04:00 |
|
Isaac Connor
|
e70d49b033
|
Merge branch 'fix_privacy_mask_segfaults' into mmap_fd_gt_3
|
2015-09-16 10:58:57 -04:00 |
|
Isaac Connor
|
6e12febf3d
|
initialize privacy_bitmask and check it before deletep[] to prevent segfault
|
2015-09-16 10:51:27 -04:00 |
|
Isaac Connor
|
535a760f26
|
Merge branch 'master' into multi-server
Conflicts:
configure.ac
|
2015-09-16 09:12:55 -04:00 |
|
Isaac Connor
|
4fa6948e5c
|
add form validation for server editing. Currently just requires a name
|
2015-09-16 09:12:21 -04:00 |
|
Isaac Connor
|
0571ca3025
|
quick fix for #1055: make sure our mmap fd is > 2
|
2015-09-16 09:11:22 -04:00 |
|
Isaac Connor
|
d3dc214d90
|
let's keep all the versions up to date
|
2015-09-16 08:39:54 -04:00 |
|
Isaac Connor
|
fb872315d1
|
add an error log entry for unknown action
|
2015-09-16 08:38:53 -04:00 |
|
Isaac Connor
|
b680aa41c5
|
save should be Save
|
2015-09-15 17:26:31 -04:00 |
|
Isaac Connor
|
d235733290
|
Need to include logger if we are going to use Error
|
2015-09-14 15:57:22 -04:00 |
|
Isaac Connor
|
6e3c8bb380
|
revert
|
2015-09-14 15:15:44 -04:00 |
|
Isaac Connor
|
df4c881b4a
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2015-09-14 15:06:51 -04:00 |
Andrew Bauer
|
e97341ced5
|
Merge pull request #1054 from knnniggett/cambozola
link to cambozola pacakge, rather than download during build
|
2015-09-14 14:02:10 -05:00 |
|
Isaac Connor
|
e88d63cb35
|
need to check the case of having a / at the end
|
2015-09-14 14:55:37 -04:00 |
Andrew Bauer
|
03172af921
|
link to cambozola pacakge, rather than download during build
|
2015-09-14 13:51:48 -05:00 |
|
Isaac Connor
|
3f3c637227
|
don't need apache patch anymore
|
2015-09-14 14:36:19 -04:00 |
|
Isaac Connor
|
407ed7ec66
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2015-09-14 14:14:23 -04:00 |
|
Isaac Connor
|
6e47812669
|
This patch is no longer needed
|
2015-09-14 14:14:13 -04:00 |
|
Isaac Connor
|
e4238edd53
|
this build patch is no longer needed
|
2015-09-14 14:11:49 -04:00 |
|
Andrew Bauer
|
c8fecee68b
|
Update CMakeLists.txt
nbtelecom was returning http 403. switching to skylineservers. In the future, I will add jscalendar packages to zmreop as that is better practice.
|
2015-09-12 18:03:20 -05:00 |
|
Andrew Bauer
|
0ff14008b3
|
Update zoneminder.el6.conf.in
ScriptAlias should point to ZM_CGIDIR instead of ZM_WEBDIR
|
2015-09-12 17:49:03 -05:00 |
|
Andrew Bauer
|
ebb6e7158a
|
rpm packaging changes for centos 6
|
2015-09-08 18:16:19 -05:00 |
|
Andrew Bauer
|
427c71f5e8
|
Update README.Centos7
|
2015-09-07 16:54:13 -05:00 |
|
Andrew Bauer
|
41cfadbcb1
|
Update zoneminder.el7.spec
typo
|
2015-09-07 16:14:58 -05:00 |
|
Andrew Bauer
|
febc0155f0
|
Merge pull request #1052 from knnniggett/rpm_packaging
redhat rpm packaging modifications
|
2015-09-07 15:58:26 -05:00 |
|
Andrew Bauer
|
dc9a5b13fe
|
redhat rpm packaging modifications
|
2015-09-07 15:50:42 -05:00 |
|
Andrew Bauer
|
04fcc253bd
|
Merge pull request #1048 from pliablepixels/1046-google-recaptcha
Google recaptcha
|
2015-09-01 08:18:54 -05:00 |
Pliable Pixels
|
2481c7a22e
|
Handled situation where user enables captcha but forgets to supply keys
|
2015-08-31 20:39:43 -04:00 |
|
Pliable Pixels
|
22a7a1d53d
|
Handled situation where user enables captcha but forgets to supply keys
|
2015-08-31 20:39:28 -04:00 |
|
Isaac Connor
|
70fa177a32
|
bump db version
|
2015-08-31 16:04:34 -04:00 |
|
Isaac Connor
|
bb41ebf776
|
Merge branch 'master' into multi-server
Conflicts:
src/zm_monitor.cpp
|
2015-08-31 16:03:40 -04:00 |
Isaac Connor
|
f107b905d7
|
Merge pull request #1045 from knnniggett/knnniggett-new_rtsp_describe
enable/disable RTSP Describe Header
|
2015-08-31 10:35:15 -04:00 |
|
Andy Bauer
|
9320efdd45
|
rpm specfile - modify symlinks
|
2015-08-29 18:04:26 -05:00 |
|
Andy Bauer
|
4ddeddeb32
|
rpm specfile - correct typo
|
2015-08-29 17:28:06 -05:00 |
|
Andy Bauer
|
4915b7fc72
|
rpm spec file - create cakephp tmp folder symlink
|
2015-08-29 16:52:16 -05:00 |
|
Pliable Pixels
|
feeb890be2
|
removed recaptcha client dependency
|
2015-08-29 15:14:20 -04:00 |
|
Pliable Pixels
|
f7fea2fe48
|
Removed dependency on recaptcha client library
|
2015-08-29 15:13:15 -04:00 |
|
Andy Bauer
|
d9c3061b52
|
Add reference to mysql Create permission in rpm README's
|
2015-08-29 14:01:45 -05:00 |
|
Pliable Pixels
|
73fa051ef8
|
Google recaptcha
|
2015-08-29 13:29:52 -04:00 |
|
Andrew Bauer
|
ef8830b373
|
Update zoneminder.el6.spec
rpm specfile - update location of perl packlist
|
2015-08-29 11:12:55 -05:00 |
|
Andrew Bauer
|
78cf7f1cf5
|
Merge pull request #1044 from schrorg/privacy-zone-docs
Add Documentation for Privacy zones
|
2015-08-29 08:16:25 -05:00 |
|
Andy Bauer
|
4a04d0411b
|
bump version to 1.28.106
|
2015-08-29 08:00:02 -05:00 |
|
Andy Bauer
|
395e628541
|
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
Conflicts:
CMakeLists.txt
configure.ac
version
|
2015-08-29 07:57:18 -05:00 |
|
Andy Bauer
|
4fdd32b596
|
bump version to 1.28.106
|
2015-08-29 07:53:08 -05:00 |
Robin Daermann
|
e822265512
|
Add Documentation for Privacy zones
|
2015-08-29 10:06:56 +02:00 |
|
Andrew Bauer
|
e89753e743
|
Merge pull request #1043 from pliablepixels/1013-document-migration
added note about potential Perl and PHP time translation conflict wit…
|
2015-08-28 19:03:26 -05:00 |
|
Pliable Pixels
|
d014a34b9a
|
added note about potential Perl and PHP time translation conflict with filters
|
2015-08-28 15:55:16 -04:00 |
|
Isaac Connor
|
f5ba7cb208
|
restore
|
2015-08-27 11:39:16 -04:00 |
|
Isaac Connor
|
c48bd3ebca
|
restore
|
2015-08-27 11:37:33 -04:00 |