Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'pfSense/master' | Danilo G. Baio (dbaio) | 2013-01-24 | 2 | -2/+2 |
|\ | |||||
| * | Fix Dansguardian build options | jim-p | 2013-01-25 | 2 | -2/+2 |
| | | |||||
* | | Fix creation of acl noauth | Danilo G. Baio (dbaio) | 2013-01-24 | 1 | -2/+5 |
| | | |||||
* | | Revert "Fix creation of acl noauth" | Danilo G. Baio (dbaio) | 2013-01-24 | 1 | -5/+2 |
| | | | | | | | | This reverts commit 23e79c9b263391e2305e7df7ac89c05bf133f416. | ||||
* | | Fix creation of acl noauth | Danilo G. Baio (dbaio) | 2013-01-24 | 1 | -2/+5 |
|/ | |||||
* | Correct missing parametr | Ermal | 2013-01-24 | 1 | -1/+1 |
| | |||||
* | Merge pull request #356 from jmkizer/master | Ermal Luçi | 2013-01-24 | 1 | -1/+2 |
|\ | | | | | Change in # of lines to display in squid logs. | ||||
| * | Update config/squid-reverse/squid_monitor.php | jmkizer | 2013-01-23 | 1 | -1/+2 |
| | | | | | | | | | | | | | | Removed 30 line option from Max lines to be displayed. Added 100 line option to Max. lines to be displayed. Added 200 line option to Max. lines to be displayed. Tested on i386 configuration. | ||||
* | | Merge pull request #358 from dbaio/master | Jim P | 2013-01-24 | 1 | -0/+39 |
|\ \ | | | | | | | Adding Zabbix-2 Agent and Zabbix-2 Proxy to the amd64 repo | ||||
| * | | Adding Zabbix-2 Agent and Zabbix-2 Proxy to the amd64 repo | Danilo G. Baio (dbaio) | 2013-01-24 | 1 | -0/+39 |
|/ / | |||||
* | | Merge pull request #357 from bmeeks8/master | Chris Buechler | 2013-01-23 | 4 | -12/+26 |
|\ \ | |/ |/| | Check to be sure file exists before reading and include flowbits rule file if missing in snort.conf | ||||
| * | Add checks to fix initial startup errors and include flowbits file in snort.conf | Bill Meeks | 2013-01-23 | 4 | -12/+26 |
|/ | |||||
* | More checking for existence of file | Ermal | 2013-01-23 | 1 | -0/+8 |
| | |||||
* | Prevent errors from missing files Reported-by: ↵ | Ermal | 2013-01-23 | 1 | -0/+3 |
| | | | | http://forum.pfsense.org/index.php/topic,51493.msg310252.html#msg310252 | ||||
* | Reword inline config link for iOS since that same client also exists for ↵ | jim-p | 2013-01-23 | 4 | -12/+26 |
| | | | | Android with the same quirks. Provide a list of commonly used clients with download links at the bottom of the export page. | ||||
* | fix typos | Chris Buechler | 2013-01-22 | 2 | -2/+2 |
| | |||||
* | Merge pull request #355 from dbaio/master | Chris Buechler | 2013-01-22 | 3 | -0/+551 |
|\ | | | | | New beta packages: Zabbix-2 Agent and Zabbix-2 Proxy | ||||
| * | New beta packages: Zabbix-2 Agent and Zabbix-2 Proxy | Danilo G. Baio (dbaio) | 2013-01-22 | 3 | -0/+551 |
|/ | |||||
* | Update OpenVPN Client Export again, rearrange options to make them more ↵ | jim-p | 2013-01-22 | 5 | -49/+88 |
| | | | | clear/easy to follow. Also bump version and promote package status to reflect how stable it has become. | ||||
* | Use correct function name | Ermal | 2013-01-22 | 1 | -1/+1 |
| | |||||
* | mailscanner - fix another typo on antivirus settings | Marcello Coutinho | 2013-01-21 | 1 | -1/+1 |
| | |||||
* | mailscanner - fix two typos in antivirus features select options | Marcello Coutinho | 2013-01-21 | 1 | -2/+2 |
| | |||||
* | Bump version as needed | Ermal | 2013-01-21 | 2 | -2/+2 |
| | |||||
* | Merge pull request #214 from namezero111111/patch-7 | Ermal Luçi | 2013-01-21 | 1 | -0/+5 |
|\ | | | | | Added SUDO checkbox for script | ||||
| * | Added SUDO checkbox for script | Namezero | 2012-02-14 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #332 from rjcrowder/master | Ermal Luçi | 2013-01-21 | 1 | -16/+22 |
|\ \ | | | | | | | Fix to not remove blacklists if the fetch fails | ||||
| * | | Update config/dansguardian/dansguardian.php | rjcrowder | 2012-10-31 | 1 | -16/+22 |
| | | | | | | | | | Added return code check when fetching the blacklists. In the previous version, the blacklist directories were removed if the fetch failed. Once the directories were removed, dansguardian would not start because the config files referenced blacklist files that did not exist. This version does not remove the blacklist directories if the blacklist fetch fails. | ||||
* | | | Merge pull request #354 from phil-davis/master | Ermal Luçi | 2013-01-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | GUI form typo fix for lcdproc-dev | ||||
| * | | | GUI form typo fix for lcdproc-dev | Phil Davis | 2013-01-21 | 1 | -1/+1 |
| | | | | | | | | | | | | Also, this form also a mix of conventions for the field labels "Com Port" "Port speed"... That mix happens in lots of GUI forms. I wonder what the pfSense project standard is - each word starts in uppercase, or just the first word? e.g. The OpenVPN Server form has "Concurrent connections" and "Duplicate Connections", and subheadings "Tunnel Settings" and "Advanced configuration". | ||||
* | | | | Unset some vars to free memory and some more small corrections | Ermal | 2013-01-21 | 1 | -4/+8 |
| | | | | |||||
* | | | | Put required $ for var | Ermal | 2013-01-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Bring some thing into style and close an unfinished comment | Ermal | 2013-01-21 | 1 | -68/+118 |
| | | | | |||||
* | | | | Add ending comment mark | Ermal | 2013-01-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #352 from bmeeks8/master | Ermal Luçi | 2013-01-21 | 13 | -507/+1637 |
|\ \ \ \ | |/ / / |/| | | | Snort GUI Package Update for New Features and Bug Fixes | ||||
| * | | | Fix it so Shared Object (SO) rules can be individually viewed in file viewer. | Bill Meeks | 2013-01-21 | 2 | -3/+4 |
| | | | | |||||
| * | | | Add checks to code to handle several different file input scenarios. | Bill Meeks | 2013-01-20 | 1 | -6/+14 |
| | | | | |||||
| * | | | Fix build_sid_msg_map() and snort_load_rules_map() to check arg type. | Bill Meeks | 2013-01-20 | 1 | -8/+12 |
| | | | | |||||
| * | | | Fix bug in page title display for CATEGORIES tab. | Bill Meeks | 2013-01-20 | 1 | -5/+4 |
| | | | | |||||
| * | | | Add IPS policy select, auto-flowbit resolution and bug fixes. | Bill Meeks | 2013-01-20 | 13 | -501/+1619 |
| | | | | |||||
* | | | | Merge pull request #353 from phil-davis/master | Chris Buechler | 2013-01-21 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix prefix for sqpmon.sh fetch | ||||
| * | | | | Fix prefix for sqpmon.sh fetch | Phil Davis | 2013-01-21 | 1 | -1/+1 |
|/ / / / | | | | | | | | | Stared at this for a while until I noticed that all the others had a terminating slash. | ||||
* | | | | Merge pull request #350 from phil-davis/master | Chris Buechler | 2013-01-20 | 6 | -82/+89 |
|\ \ \ \ | |/ / / |/| | | | Replace proxy_monitor with sqpmon for squid(2) | ||||
| * | | | Modify to suit squid (2) | Phil Davis | 2013-01-12 | 1 | -3/+3 |
| | | | | |||||
| * | | | sqpmon replaces proxy_monitor for squid(2) | Phil Davis | 2013-01-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | sqpmon replaces proxy_monitor for squid(2) | Phil Davis | 2013-01-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Remove proxy_monitor.sh | Phil Davis | 2013-01-12 | 1 | -72/+0 |
| | | | | |||||
| * | | | Create sqpmon.sh | Phil Davis | 2013-01-12 | 1 | -0/+75 |
| | | | | |||||
| * | | | Replace proxy_monitor with sqp_monitor and sqpmon | Phil Davis | 2013-01-12 | 1 | -4/+4 |
| | | | | |||||
| * | | | Replace proxy_monitor with sqp_monitor and sqpmon | Phil Davis | 2013-01-12 | 1 | -4/+8 |
| | | | | |||||
* | | | | Fix up the inline config format a little to make Android and iOS both happy. | jim-p | 2013-01-17 | 4 | -19/+13 |
| | | | |