aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #617 from bmeeks8/masterRenato Botelho2014-03-044-10/+10
|\
| * Revert back to Ajax.url() call in widget because getURL() not in 2.1 -- oops!bmeeks82014-03-041-2/+9
| * Fix "even/odd" table row class assigns in widget -- they were backwards.bmeeks82014-03-041-1/+1
| * No SIGHUP required to Suricata when clearing logs, so remove calls.bmeeks82014-03-042-7/+0
* | Fix spellRenato Botelho2014-03-041-1/+1
* | Merge pull request #612 from bmeeks8/masterRenato Botelho2014-03-0432-1619/+1898
|\|
| * Fix display order issue with Suricata Dashboard Widget.bmeeks82014-03-032-65/+56
| * Change rule set names from all caps to regular case and some formatting.bmeeks82014-03-011-13/+13
| * Merge branch 'suricata-0.2'bmeeks82014-02-2832-1615/+1903
| |\
| | * Bump Suricata package version to v0.2-BETAbmeeks82014-02-283-9/+9
| | * Bug fixes and enhancements for v0.2-BETA in Suricata pkg.bmeeks82014-02-2814-212/+178
| | * Allow passing of interface index for opening associated logs.bmeeks82014-02-281-0/+2
| | * Remove use of SESSION vars and convert to $_POST to save return page.bmeeks82014-02-281-49/+41
| | * Remove last of custom wrapper funcs and incorporate Bro-IDS for Barnyard2.bmeeks82014-02-281-30/+22
| | * Add new output option for Bro-IDS destination for Barnyard2.bmeeks82014-02-281-35/+126
| | * Prevent deleting of Suppress Lists in active use.bmeeks82014-02-281-48/+93
| | * Match standard GUI style and add a 'force update' feature.bmeeks82014-02-281-28/+90
| | * Add installation paths for Dashboard Widget files.bmeeks82014-02-281-1/+16
| | * Add new Dashboard Widget files now included in package.bmeeks82014-02-281-1/+3
| | * Add built-in Dashboard Widget for Suricata and make it persistent.bmeeks82014-02-285-2/+346
| | * Delete 'suricata_select_alias.php' file since it is no longer needed.bmeeks82014-02-242-231/+0
| | * Some bug fixes and replace $_GET with $_POST where possible.bmeeks82014-02-242-73/+56
| | * Some bug fixes and replace $_GET with $_POST in parameter passing.bmeeks82014-02-245-458/+512
| | * Add temp fix in post-install to add default rules back to enabled rules.bmeeks82014-02-241-0/+11
| | * Bug fixes and replace $_GET with $_POST where possible.bmeeks82014-02-2411-469/+408
| | * Fix it so all ET-Open rules files get correct prefix.bmeeks82014-02-221-5/+15
| | * Continue change of $_GET to $_POST wherever possible.bmeeks82014-02-223-90/+107
| | * Remove use of $_GET wherever possible for security.bmeeks82014-02-212-19/+14
| | * unlink() can't delete directory, use "/bin/rm -rf" instead.bmeeks82014-02-201-3/+2
| | * Fix custom rules clear bug and enable custom rule testing.bmeeks82014-02-201-17/+17
* | | Merge pull request #613 from rmiddle/masterRenato Botelho2014-03-042-0/+12
|\ \ \
| * | | Add an Advanced Parameters to the proxy settings.Robert Middleswarth2014-03-022-0/+12
* | | | Merge pull request #616 from crocomo/bindRenato Botelho2014-03-042-10/+16
|\ \ \ \
| * | | | Enable built-in ACLs; Fix version.bind; Fix typoscrocomo2014-03-042-10/+16
| |/ / /
* / / / Update installed package to reflect same version number as the pkg versionWarren Baker2014-03-032-4/+4
|/ / /
* | | Merge pull request #604 from crocomo/bindRenato Botelho2014-02-281-2/+2
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master' into bindcrocomo2014-02-251-1/+1
| |\ \ \
| * | | | Fix indentation of custom optioncrocomo2014-02-231-2/+2
* | | | | Merge pull request #607 from parawizard/masterRenato Botelho2014-02-282-2/+2
|\ \ \ \ \
| * | | | | %P to %p for freebsd strftime compatiblityBryan Paradis2014-02-251-1/+1
| * | | | | %P to %p for freebsd strftime compatiblityBryan Paradis2014-02-251-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #611 from PiBa-NL/hap_reloadcheckRenato Botelho2014-02-281-8/+6
|\ \ \ \ \
| * | | | | haproxy-devel, dont reload firewall rules every 2 minutes.PiBa-NL2014-02-281-8/+6
|/ / / / /
* | | | | Custom options should be before forward-zone as seen on the forum.Warren Baker2014-02-261-9/+8
* | | | | Respect the 0 valueWarren Baker2014-02-261-2/+2
* | | | | Merge pull request #608 from fschaeffler/Fix-for-email-address-as-execution-p...Renato Botelho2014-02-251-1/+1
|\ \ \ \ \
| * | | | | Update arpwatch.xmlFlorian Schäffler2014-02-251-1/+1
|/ / / / /
* | | | | Merge pull request #593 from stilez/patch-1Marcello Coutinho2014-02-252-37/+39
|\ \ \ \ \
| * | | | | Add PERMIT BOTH option, and minor enhancementsstilez2014-02-171-13/+27
| * | | | | Add PERMIT BOTH option, and minor enhancementsstilez2014-02-171-24/+12