aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix NRPEv2 build flags (they were backwards for SET/UNSET)jim-p2013-06-102-2/+2
* Bump pkg version for squidGuard.jim-p2013-06-102-4/+4
* Add LDAP search patch from http://forum.pfsense.org/index.php/topic,59246.0.htmljim-p2013-06-104-15/+110
* Fixup squid/sqidGuard build options now that the squid port has OPTIONSNGjim-p2013-06-102-6/+4
* Bump the haproxy binaries up to 1.4.23jim-p2013-06-102-12/+12
* Merge pull request #456 from N0YB/masterErmal Luçi2013-06-093-27/+69
|\
| * Add Proxy Type OptionN0YB2013-06-061-10/+12
| * Add Proxy Type OptionN0YB2013-06-061-1/+1
| * Add Proxy Type OptionN0YB2013-06-061-14/+31
| * Add Proxy Type OptionN0YB2013-06-052-7/+30
* | Merge pull request #458 from deelowe/masterJim P2013-06-081-1/+1
|\ \
| * | Fixed edit report logs bug in status_mail_report_edit.phpDavid Lee2013-06-081-1/+1
|/ /
* | Merge pull request #457 from petr-tichy/masterErmal Luçi2013-06-071-1/+1
|\ \
| * | Fixed incorrect limit on number of processes of smtpd in generated master.confPetr Tichy2013-06-071-1/+1
|/ /
* | Merge pull request #455 from bmeeks8/masterErmal Luçi2013-06-076-110/+142
|\ \
| * | Fix SELECT ALL to not add all Snort rules when IPS Policy is set.bmeeks82013-06-051-56/+69
| * | Fix HTML rendering issues found in cross-browser testing.bmeeks82013-06-043-6/+6
| * | Fix it so we return to selected category after page edits.bmeeks82013-06-041-28/+32
| * | Remove some extraneous pass-by-reference tags to stop "copy on write"bmeeks82013-06-041-4/+4
| * | Merge remote-tracking branch 'upstream/master'bmeeks82013-06-042-10/+10
| |\|
| * | Fix PHP out-of-memory error with large rule sets and IPS Policy displaybmeeks82013-06-031-12/+17
| * | Fix it so Select All also gets Snort GPLv2 Community Rules.bmeeks82013-06-031-3/+3
| * | Add a rule counter for display at the bottom of page.bmeeks82013-06-031-1/+6
| * | Save and restore state of "$pkg_interface" variable on exit.bmeeks82013-06-031-0/+5
* | | squid3-dev - remove obsolete ignore_expect_100 option and include info on gui...Marcello Coutinho2013-06-072-2/+5
| |/ |/|
* | Activate "squidguard+squid3" pbi to hopefully alleviate some of the (re)insta...jim-p2013-06-042-10/+10
|/
* Merge pull request #454 from bmeeks8/masterErmal Luçi2013-06-039-48/+54
|\
| * Add check to verify existence of array item before we use it.bmeeks82013-06-011-6/+10
| * Add HTML markup to wrap IPv6 address in Alert and Blocked tabs.bmeeks82013-06-012-1/+8
| * Minor HTML code edits for styles and tag closure.bmeeks82013-05-313-20/+13
| * Incorporate Ermal's comments from 2.5.8 pkg review.bmeeks82013-05-311-13/+10
| * Tweak error message logging a bit for completeness.bmeeks82013-05-311-0/+6
| * Remove misplaced </div> tag that was causing issues with some themes.bmeeks82013-05-311-7/+6
| * Correct misspelled word "enabling" in a caption.bmeeks82013-05-311-1/+1
| * Merge remote-tracking branch 'upstream/master'bmeeks82013-05-3123-113/+271
| |\ | |/ |/|
* | Merge pull request #453 from PiBa-NL/haproxy-devel-2.1Ermal Luçi2013-05-304-23/+61
|\ \
| * | haproxy-devel, fix required fields a shared-backend, optional Force immediate...PiBa-NL2013-05-244-23/+61
* | | Merge pull request #448 from bmeeks8/masterErmal Luçi2013-05-3024-1244/+3410
|\ \ \
* | | | dansguardian - improve ldap fetch code and fix cron problem on 2.1Marcello Coutinho2013-05-293-18/+72
* | | | Try yet another slightly different tactic.jim-p2013-05-292-2/+2
* | | | Tweak the build options a little differentlyjim-p2013-05-292-2/+2
* | | | Detect and use the squidGuard variant if it's found.jim-p2013-05-291-3/+6
* | | | Give it another nudge in the squid33 direction.jim-p2013-05-292-2/+2
* | | | Use squid33 since squid31 disappeared.jim-p2013-05-292-2/+2
* | | | Add placeholder for a squid3-specific build of squidGuard (all xml/php files ...jim-p2013-05-292-0/+40
* | | | squid3-dev - fix cascade sync while using system sync settingsMarcello Coutinho2013-05-281-8/+10
* | | | Fix/relocate a bunch of missing files/dependencies for binaries that were rem...jim-p2013-05-2811-50/+62
* | | | dansguardian - fix cascade sync while using system sync settingsMarcello Coutinho2013-05-281-5/+5
* | | | These are binaries and should really be pulling from files, not overlayed on ...jim-p2013-05-281-2/+2
* | | | add missing AutoConfigBackup fileChris Buechler2013-05-281-0/+8