aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1167 from doktornotor/patch-24Chris Buechler2015-11-146-96/+270
|\
| * 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
| * ntop - package fixes and cleanupsdoktornotor2015-11-141-91/+71
* | Merge pull request #1168 from doktornotor/patch-25Chris Buechler2015-11-145-10/+54
|\ \
| * | Bump nut package versiondoktornotor2015-11-141-3/+3
| * | Bump nut package versiondoktornotor2015-11-141-3/+3
| * | Bump nut package versiondoktornotor2015-11-141-2/+2
| * | Add privileges configuration to nut packagedoktornotor2015-11-141-0/+40
| * | Add privileges configuration to nut packagedoktornotor2015-11-141-2/+6
| |/
* | Merge pull request #1169 from doktornotor/patch-26Chris Buechler2015-11-144-309/+0
|\ \ | |/ |/|
| * Remove completely broken phpsysinfo packagedoktornotor2015-11-141-16/+0
| * Remove completely broken phpsysinfo packagedoktornotor2015-11-141-16/+0
| * Delete phpsysinfo.xmldoktornotor2015-11-141-121/+0
| * Delete phpsysinfo.incdoktornotor2015-11-141-156/+0
|/
* 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 lo...jim-p2015-11-125-8/+8
* Add timezone conversion for ACB timestamps, server always returns time in US ...jim-p2015-11-125-4/+15
* 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
|/ /
* | Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-4/+0
* | Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-2/+0
* | Revert "Bunch of other conflicting things"Renato Botelho2015-11-061-5/+0
* | Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-12/+0
* | Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-10/+0
* | Revert "Bunch of other conflicting things"Renato Botelho2015-11-061-5/+0
* | Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-12/+0
* | Revert "Mark conflicting packages as such"Renato Botelho2015-11-061-10/+0
* | Revert "Bunch of other conflicting things"Renato Botelho2015-11-061-5/+0
* | Merge pull request #1098 from doktornotor/patch-1Renato Botelho2015-11-065-21/+170
|\ \
| * | Bunch of other conflicting thingsdoktornotor2015-11-051-0/+5
| * | Bunch of other conflicting thingsdoktornotor2015-11-051-0/+5
| * | Bunch of other conflicting thingsdoktornotor2015-11-051-0/+5
| * | Mark conflicting packages as suchdoktornotor2015-10-151-0/+10
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:13:20 +0000