aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #702 from yuki/masterRenato Botelho2014-09-245-5/+19
|\ \ \ \ \
| * | | | | Modified package versionsYuki (aka Ruben Gomez)2014-09-243-3/+3
| * | | | | Modifications to allow nrpe arguments (dont_blame_nrpe) in the config editionYuki (aka Ruben Gomez)2014-09-172-2/+16
* | | | | | Merge pull request #707 from ExolonDX/branch_master_01Renato Botelho2014-09-246-9/+9
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Update font used by File ManagerColin Fleming2014-09-236-9/+9
|/ / / / /
* | | | | Merge pull request #706 from PiBa-NL/haproxy_1.5.3_extrajim-p2014-09-232-35/+65
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | haproxy-devel, fix template certificate generation on 2.2, fix certificate ac...PiBa-NL2014-09-232-35/+65
* | | | | Merge pull request #705 from yylyyl/masterRenato Botelho2014-09-235-8/+9
|\ \ \ \ \
| * | | | | version bumpyylyyl2014-09-233-3/+3
| * | | | | it's $lcdproc_config['comport'] that can be "none" but $realportyylyyl2014-09-231-1/+1
| * | | | | lcd2usb doesn't need Device to be specified, also fix traffic displayyylyyl2014-09-232-5/+6
* | | | | | Merge pull request #704 from PiBa-NL/haproxy_1.5.3_extrajim-p2014-09-237-105/+54
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | haproxy-devel, fix extra sni acl's, allow a ipalias to be entered for source ...PiBa-NL2014-09-237-105/+54
* | | | | Merge pull request #703 from MarkVLK/patch-1Renato Botelho2014-09-191-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix typo and broken link in sarg about sectionMarkVLK2014-09-191-2/+2
|/ / / /
* | | | Follow 2.2 and change 8hour->eighthour and 4year->fouryear to avoid having a ...jim-p2014-09-166-9/+23
* | | | Update bind to 9.9.5P1_5, it fixes #3711Renato Botelho2014-09-163-6/+6
|/ / /
* | | Merge pull request #700 from PiBa-NL/haproxy_1.5.3jim-p2014-09-151-1/+1
|\ \ \
| * | | haproxy-devel, bugfix, undefined variable caused error, now htmllist_get_sele...PiBa-NL2014-09-151-1/+1
* | | | Merge pull request #699 from PiBa-NL/haproxy_1.5.3jim-p2014-09-157-305/+896
|\| | |
| * | | haproxy-devel improvementsPiBa-NL2014-09-147-305/+896
* | | | fix typo in variableChris Buechler2014-09-131-2/+2
* | | | Merge pull request #698 from bmeeks8/suricata-2.0.3-v2.0.2Renato Botelho2014-09-0916-21/+98
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use rename() instead of shell call for renaming directories.bmeeks82014-09-091-1/+2
| * | | Bump Suricata GUI package version to 2.0.3 v2.0.2bmeeks82014-09-086-7/+7
| * | | Move call to write_config() so as not to invalidate the loop iterator.bmeeks82014-09-081-1/+1
| * | | Fix any duplicate UUIDs and 'dns-events.rules' entries in config.bmeeks82014-09-082-1/+40
| * | | Add count of USER ENABLED & DISABLED rules to page summary.bmeeks82014-09-081-1/+5
| * | | Sync some changes to CARP slaves when enabled.bmeeks82014-09-077-0/+30
| * | | Use $_POST instead of $_GET for DEL action to improve security.bmeeks82014-09-071-9/+9
| * | | Fix typo in tooltip & ignore invalid block.log entries when dispaying.bmeeks82014-09-071-2/+5
| * | | Remove unnecessary call to trim(). Causes error on 2.1.x systems.bmeeks82014-09-071-2/+2
|/ / /
* | | Bump suricata versionRenato Botelho2014-09-064-4/+4
* | | Fix typo on function nameRenato Botelho2014-09-061-1/+1
* | | Merge pull request #696 from bmeeks8/suricata-2.0.3-v2.0Renato Botelho2014-09-0645-809/+5158
|\ \ \
| * | | Some changes no longer needed since dns-events.rules file is now in PBI.bmeeks82014-09-053-25/+0
| * | | Check if spaces in BY2 Sensor Name and show validation error.bmeeks82014-09-051-1/+7
| * | | Update static HTML text on page to reflect change in options.bmeeks82014-09-051-1/+1
| * | | Bug fix for cloning interface via DUP icon.bmeeks82014-09-051-2/+5
| * | | Notify user on ALERTS tab when viewing filtered results.bmeeks82014-09-051-0/+7
| * | | Default "forcekeepsettings" to 'on' for new installs (Issue #3838)bmeeks82014-09-041-1/+6
| * | | Disable EVE log options when interface is disabled.bmeeks82014-09-041-0/+6
| * | | Fix spelling error typo in a comment line.bmeeks82014-09-041-1/+1
| * | | Prevent setting filesystem to read-only during post-install rule update.bmeeks82014-09-041-1/+5
| * | | Add new GUI control for setting interface promisc mode on/off.bmeeks82014-09-044-0/+27
| * | | Strip any CR characters that may get pasted into some control fields.bmeeks82014-09-034-4/+4
| * | | Change title for Widget column to Priority/Class instead.bmeeks82014-09-021-1/+1
| * | | Change title in Suricata Widget column header to Priority/Rule Name.bmeeks82014-09-021-1/+1
| * | | Include new 'dns-events.rules' file for Suricata 2.0.3bmeeks82014-09-017-3/+36
| * | | Suricata prefers CIDR masks on HOME_NET and EXTERNAL_NET addresses.bmeeks82014-08-303-39/+56