Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #1166 from doktornotor/patch-23 | Chris Buechler | 2015-11-14 | 6 | -14/+58 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Bump and sanitize lcdproc package version | doktornotor | 2015-11-14 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Bump and sanitize lcdproc package version | doktornotor | 2015-11-14 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Bump lcdproc package version | doktornotor | 2015-11-14 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Add privileges configuration to lcdproc package | doktornotor | 2015-11-14 | 1 | -5/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | Add privileges configuration to lcdproc package | doktornotor | 2015-11-14 | 1 | -0/+40 | |
| | | | | | | | | ||||||
| * | | | | | | | Add privileges configuration to lcdproc package | doktornotor | 2015-11-14 | 1 | -4/+8 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #1167 from doktornotor/patch-24 | Chris Buechler | 2015-11-14 | 6 | -96/+270 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix the merge ifaces logic for renamed option | doktornotor | 2015-11-14 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Bump and sanitize ntop package version | doktornotor | 2015-11-14 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Bump and sanitize ntop package version | doktornotor | 2015-11-14 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Bump ntop package version | doktornotor | 2015-11-14 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Add privileges configuration to ntop package | doktornotor | 2015-11-14 | 1 | -0/+37 | |
| | | | | | | | | ||||||
| * | | | | | | | ntop - package fixes and cleanups | doktornotor | 2015-11-14 | 1 | -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 cleanups | doktornotor | 2015-11-14 | 1 | -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 | |||||
* | | | | | | | Merge pull request #1168 from doktornotor/patch-25 | Chris Buechler | 2015-11-14 | 5 | -10/+54 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Bump nut package version | doktornotor | 2015-11-14 | 1 | -3/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Bump nut package version | doktornotor | 2015-11-14 | 1 | -3/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Bump nut package version | doktornotor | 2015-11-14 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Add privileges configuration to nut package | doktornotor | 2015-11-14 | 1 | -0/+40 | |
| | | | | | | | | ||||||
| * | | | | | | | Add privileges configuration to nut package | doktornotor | 2015-11-14 | 1 | -2/+6 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #1169 from doktornotor/patch-26 | Chris Buechler | 2015-11-14 | 4 | -309/+0 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Remove completely broken phpsysinfo package | doktornotor | 2015-11-14 | 1 | -16/+0 | |
| | | | | | | | ||||||
| * | | | | | | Remove completely broken phpsysinfo package | doktornotor | 2015-11-14 | 1 | -16/+0 | |
| | | | | | | | ||||||
| * | | | | | | Delete phpsysinfo.xml | doktornotor | 2015-11-14 | 1 | -121/+0 | |
| | | | | | | | ||||||
| * | | | | | | Delete phpsysinfo.inc | doktornotor | 2015-11-14 | 1 | -156/+0 | |
|/ / / / / / | ||||||
* | | | | | | Version bump ACB again. Issue #5250 | jim-p | 2015-11-12 | 4 | -4/+4 | |
| | | | | | | ||||||
* | | | | | | Convert save message date as well. Fixes #5250 | jim-p | 2015-11-12 | 1 | -5/+7 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Server operations need the original timestamp, but keep the pretty one for ↵ | jim-p | 2015-11-12 | 5 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | local presentation. Fixes #5250 | |||||
* | | | | | Add timezone conversion for ACB timestamps, server always returns time in US ↵ | jim-p | 2015-11-12 | 5 | -4/+15 | |
| |/ / / |/| | | | | | | | | | | | Central time, convert to locally set TZ. Fixes #5250 | |||||
* | | | | Merge pull request #1150 from bmeeks8/suricata-snort_build_options-fix | Renato Botelho | 2015-11-11 | 1 | -2/+2 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | Fix for Snort and Suricata <build_options>. | bmeeks8 | 2015-11-11 | 1 | -2/+2 | |
|/ / / | ||||||
* | | | Merge pull request #1148 from bmeeks8/suricata-2.1.9 | Renato Botelho | 2015-11-10 | 11 | -51/+204 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Update Suricata binary to v2.0.9 and GUI pkg to 2.1.9 | bmeeks8 | 2015-11-09 | 2 | -3/+3 | |
| | | | ||||||
| * | | Update example Snort VRT rules tarball filename in form control legend. | bmeeks8 | 2015-11-09 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix typo in new Unified2 logging enable variable name. | bmeeks8 | 2015-11-09 | 1 | -2/+2 | |
| | | | ||||||
| * | | Add support for X-Forwarded-For info to Unified2 log output options. | bmeeks8 | 2015-11-09 | 4 | -1/+123 | |
| | | | ||||||
| * | | Bump up stream_memcap default to 64 MB and add config note to GUI. | bmeeks8 | 2015-11-09 | 3 | -7/+13 | |
| | | | ||||||
| * | | Respect global $static_out in update_output_window() calls. | bmeeks8 | 2015-11-05 | 2 | -39/+64 | |
| | | | ||||||
* | | | Merge pull request #1141 from doktornotor/patch-1 | Renato Botelho | 2015-11-06 | 1 | -4/+4 | |
|\ \ \ | ||||||
| * | | | Fix misplaced single quote, linebreaks | doktornotor | 2015-11-06 | 1 | -4/+4 | |
|/ / / | ||||||
* | | | Merge pull request #1140 from doktornotor/patch-1 | Renato Botelho | 2015-11-06 | 1 | -130/+187 | |
|\ \ \ | ||||||
| * | | | Add warnings about conflicting packages, some cleanups | doktornotor | 2015-11-06 | 1 | -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 Botelho | 2015-11-06 | 1 | -4/+0 | |
| | | | | | | | | | | | | This reverts commit 6fd0d63853233938b361a3794e3caa07117b9b6b. | |||||
* | | | Revert "Mark conflicting packages as such" | Renato Botelho | 2015-11-06 | 1 | -2/+0 | |
| | | | | | | | | | | | | This reverts commit 9e07dbf05077df5774502c887ce25db2cc370b5e. | |||||
* | | | Revert "Bunch of other conflicting things" | Renato Botelho | 2015-11-06 | 1 | -5/+0 | |
| | | | | | | | | | | | | This reverts commit 6c6f2117095537ff124ffb806311cad94b2a26a2. | |||||
* | | | Revert "Mark conflicting packages as such" | Renato Botelho | 2015-11-06 | 1 | -12/+0 | |
| | | | | | | | | | | | | This reverts commit e6f7fc6681c67880bc1019e2aab5cb9986b5cee1. | |||||
* | | | Revert "Mark conflicting packages as such" | Renato Botelho | 2015-11-06 | 1 | -10/+0 | |
| | | | | | | | | | | | | This reverts commit 920a07a75bf6f20b2cb2701e813aa0107920b34c. | |||||
* | | | Revert "Bunch of other conflicting things" | Renato Botelho | 2015-11-06 | 1 | -5/+0 | |
| | | | | | | | | | | | | This reverts commit 671d60698f6ef4baf6be06cf8671a035e3841786. | |||||
* | | | Revert "Mark conflicting packages as such" | Renato Botelho | 2015-11-06 | 1 | -12/+0 | |
| | | | | | | | | | | | | This reverts commit 98f634066ccd36f7ebebf11b84b7c024d2159594. |