aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix the merge ifaces logic for renamed optiondoktornotor2015-11-141-1/+1
|
* Bump and sanitize ntop package versiondoktornotor2015-11-141-2/+2
|
* Bump and sanitize ntop package versiondoktornotor2015-11-141-2/+2
|
* Bump ntop package versiondoktornotor2015-11-141-1/+1
|
* Add privileges configuration to ntop packagedoktornotor2015-11-141-0/+37
|
* ntop - package fixes and cleanupsdoktornotor2015-11-141-0/+157
| | | | | | | | | | - Split PHP code to an inc file - Make it possible to disable ntop without uninstalling - Add Keep Data/Settings feature - Remove graphs/data/configuration on uninstall if Keep Data/Settings is disabled - Fix flipped 'Allow merging interfaces' meaning - Do not restart ntop during boot - Add privileges configuration - Code style cleanups
* ntop - package fixes and cleanupsdoktornotor2015-11-141-91/+71
| | | | | | | | - Split PHP code to an inc file - Make it possible to disable ntop without uninstalling - Add Keep Data/Settings feature - Fix flipped 'Allow merging interfaces' meaning - Add privileges configuration - Code style cleanups
* Version bump ACB again. Issue #5250jim-p2015-11-124-4/+4
|
* Convert save message date as well. Fixes #5250jim-p2015-11-121-5/+7
|
* Server operations need the original timestamp, but keep the pretty one for ↵jim-p2015-11-125-8/+8
| | | | local presentation. Fixes #5250
* Add timezone conversion for ACB timestamps, server always returns time in US ↵jim-p2015-11-125-4/+15
| | | | Central time, convert to locally set TZ. Fixes #5250
* Merge pull request #1150 from bmeeks8/suricata-snort_build_options-fixRenato Botelho2015-11-111-2/+2
|\
| * Fix for Snort and Suricata <build_options>.bmeeks82015-11-111-2/+2
|/
* Merge pull request #1148 from bmeeks8/suricata-2.1.9Renato Botelho2015-11-1011-51/+204
|\
| * Update Suricata binary to v2.0.9 and GUI pkg to 2.1.9bmeeks82015-11-092-3/+3
| |
| * Update example Snort VRT rules tarball filename in form control legend.bmeeks82015-11-091-1/+1
| |
| * Fix typo in new Unified2 logging enable variable name.bmeeks82015-11-091-2/+2
| |
| * Add support for X-Forwarded-For info to Unified2 log output options.bmeeks82015-11-094-1/+123
| |
| * Bump up stream_memcap default to 64 MB and add config note to GUI.bmeeks82015-11-093-7/+13
| |
| * Respect global $static_out in update_output_window() calls.bmeeks82015-11-052-39/+64
| |
* | Merge pull request #1141 from doktornotor/patch-1Renato Botelho2015-11-061-4/+4
|\ \
| * | Fix misplaced single quote, linebreaksdoktornotor2015-11-061-4/+4
|/ /
* | Merge pull request #1140 from doktornotor/patch-1Renato Botelho2015-11-061-130/+187
|\ \
| * | Add warnings about conflicting packages, some cleanupsdoktornotor2015-11-061-130/+187
|/ / | | | | | | | | | | | | - Add warnings about ClamAV conflicts among Squid3, Dansguardian, Mailscanner and HAVP packages. - Clean up/improve some descriptions - Use unified ALPHA/BETA/RC/RELEASE status for packages. - Sanitize package categories a bit. - Improve some post-install info messages.
* | Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-4/+0
| | | | | | | | This reverts commit 6fd0d63853233938b361a3794e3caa07117b9b6b.
* | Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-2/+0
| | | | | | | | This reverts commit 9e07dbf05077df5774502c887ce25db2cc370b5e.
* | Revert "Bunch of other conflicting things"Renato Botelho2015-11-061-5/+0
| | | | | | | | This reverts commit 6c6f2117095537ff124ffb806311cad94b2a26a2.
* | Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-12/+0
| | | | | | | | This reverts commit e6f7fc6681c67880bc1019e2aab5cb9986b5cee1.
* | Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-10/+0
| | | | | | | | This reverts commit 920a07a75bf6f20b2cb2701e813aa0107920b34c.
* | Revert "Bunch of other conflicting things"Renato Botelho2015-11-061-5/+0
| | | | | | | | This reverts commit 671d60698f6ef4baf6be06cf8671a035e3841786.
* | Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-12/+0
| | | | | | | | This reverts commit 98f634066ccd36f7ebebf11b84b7c024d2159594.
* | Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-10/+0
| | | | | | | | This reverts commit e905d04f18fda340787ab8e6687e66ec5df91b05.
* | Revert "Bunch of other conflicting things"Renato Botelho2015-11-061-5/+0
| | | | | | | | This reverts commit 7916d51b6408ef1dc5ff04907ed8e03f7d2b0f1e.
* | Merge pull request #1098 from doktornotor/patch-1Renato Botelho2015-11-065-21/+170
|\ \
| * | Bunch of other conflicting thingsdoktornotor2015-11-051-0/+5
| | | | | | | | | All of these install their own ClamAV with shared dirs screwing each others permissions...
| * | Bunch of other conflicting thingsdoktornotor2015-11-051-0/+5
| | | | | | | | | All of these install their own ClamAV with shared dirs screwing each others permissions...
| * | Bunch of other conflicting thingsdoktornotor2015-11-051-0/+5
| | | | | | | | | All of these install their own ClamAV with shared dirs screwing each others permissions...
| * | Mark conflicting packages as suchdoktornotor2015-10-151-0/+10
| | | | | | | | | Only allow installing relevant SquidGuard package version matching the Squid package.
| * | Mark conflicting packages as suchdoktornotor2015-10-151-0/+10
| | | | | | | | | Only allow installing relevant SquidGuard package version matching the Squid package.
| * | Mark conflicting packages as suchdoktornotor2015-10-151-0/+2
| | | | | | | | | Only allow installing relevant SquidGuard package version matching the Squid package.
| * | Mark conflicting packages as suchdoktornotor2015-10-151-0/+12
| | |
| * | Mark conflicting packages as suchdoktornotor2015-10-151-0/+12
| | |
| * | Mark conflicting packages as suchdoktornotor2015-10-151-0/+4
| | |
| * | Bump squidGuard-squid3 package versiondoktornotor2015-10-151-1/+1
| | |
| * | Bump squidGuard-squid3 package versiondoktornotor2015-10-151-1/+1
| | |
| * | Bump squidGuard package versiondoktornotor2015-10-151-1/+1
| | |
| * | Bump squidGuard package versiondoktornotor2015-10-151-1/+1
| | |
| * | Bump squidGuard package versiondoktornotor2015-10-151-1/+1
| | |
| * | Add privileges configuration to squidguard packagedoktornotor2015-10-151-16/+45
| | | | | | | | | Fix file permissions, nuke useless tags, add copyright header and sanitize version while here.
| * | Add privileges configuration to squidguard packagedoktornotor2015-10-151-0/+55
| | |