Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Code style services unbound | Phil Davis | 2015-05-28 | 5 | -331/+420 | |
| | | ||||||
* | | Merge pull request #1471 from Talyrius/master | Renato Botelho | 2015-05-28 | 2 | -2/+42 | |
|\ \ | ||||||
| * | | Add RTMP to the Traffic Shaper | Talyrius | 2015-02-04 | 2 | -2/+42 | |
| | | | ||||||
* | | | L7 protocols: add rtmp, sync bittorrent, finger and quake-halflife with ↵ | Renato Botelho | 2015-05-28 | 4 | -4/+22 | |
| | | | | | | | | | | | | l7-protocols | |||||
* | | | Merge pull request #1444 from oliwel/feature/easyrule-unblock | Renato Botelho | 2015-05-28 | 1 | -2/+21 | |
|\ \ \ | ||||||
| * | | | Fix comment style | Oliver Welter | 2015-05-27 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Merge branch 'master' into feature/easyrule-unblock | Oliver Welter | 2015-03-03 | 113 | -363/+574 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/easyrule.inc | |||||
| * | | | | Derive name from easyrule block alias from the scripts name | Oliver Welter | 2015-01-18 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Allows to use different block lists by using symlinks to the easyrule CLI script | |||||
| * | | | | Add showblock and unblock options to easyrule CLI tool | Oliver Welter | 2015-01-18 | 1 | -1/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block rules added with easyrule block.... can now be listed and removed using the easyrule tool. This is handy to be used with external IDS like tools, e.g fail2ban. | |||||
* | | | | | Merge pull request #1033 from aqueeb/master | Renato Botelho | 2015-05-28 | 1 | -1/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Added the Stateless DHCP Dropdown here | aqueeb | 2014-03-22 | 1 | -1/+2 | |
| | | | | | | ||||||
* | | | | | | Code style services r s w | Phil Davis | 2015-05-27 | 4 | -580/+639 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #1081 from PiBa-NL/cert_usage | Ermal LUÇI | 2015-05-27 | 1 | -0/+21 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | add is_array safety check | PiBa-NL | 2014-04-13 | 1 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | Certificate Manager, call packages plugin function to show used certificates | PiBa-NL | 2014-04-13 | 1 | -0/+19 | |
| | | | | | | | ||||||
* | | | | | | | Code style www diag more bits | Phil Davis | 2015-05-27 | 28 | -721/+796 | |
| | | | | | | | ||||||
* | | | | | | | Code style diag logs again | Phil Davis | 2015-05-26 | 17 | -653/+736 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while making a fix today I noticed that I had done these early-on and had not tabbed out the HTML nicely... | |||||
* | | | | | | | Add tracker rule number to dynamic firewall log | Phil Davis | 2015-05-26 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | Bug #4730 - the code was not there yet. | |||||
* | | | | | | | Call htmlspecialchars() to remove dangerouns chars from zone parameter. Also ↵ | Renato Botelho | 2015-05-25 | 1 | -3/+3 | |
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | redirect user to services_captiveportal_zones.php when an invalid zone is passed | |||||
* | | | | | | Merge pull request #1686 from phil-davis/service-rfc2136 | Renato Botelho | 2015-05-25 | 2 | -226/+271 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Code style services RFC2136 | Phil Davis | 2015-05-24 | 2 | -226/+271 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #1685 from phil-davis/services-ntp | Renato Botelho | 2015-05-25 | 3 | -568/+658 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Code style services NTP | Phil Davis | 2015-05-24 | 3 | -568/+658 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #1684 from phil-davis/services-igmp | Renato Botelho | 2015-05-25 | 2 | -205/+235 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Code style services igmpproxy | Phil Davis | 2015-05-24 | 2 | -205/+235 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #1683 from phil-davis/www-services-dyndns | Renato Botelho | 2015-05-25 | 2 | -331/+379 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Code style services dyndns | Phil Davis | 2015-05-24 | 2 | -331/+379 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #1682 from phil-davis/www-services-dnsmasq | Renato Botelho | 2015-05-25 | 3 | -362/+485 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Code style services dnsmasq | Phil Davis | 2015-05-24 | 3 | -362/+485 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #1681 from phil-davis/patch-2 | Renato Botelho | 2015-05-25 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Unbalanced td tag in services_dnsmasq | Phil Davis | 2015-05-24 | 1 | -0/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #1680 from phil-davis/www-services-cp | Renato Botelho | 2015-05-25 | 12 | -1429/+1783 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Code style www services captive portal | Phil Davis | 2015-05-24 | 12 | -1429/+1783 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #1679 from phil-davis/services_dhcp | Renato Botelho | 2015-05-25 | 6 | -1526/+1832 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Code style services DHCP | Phil Davis | 2015-05-23 | 6 | -1526/+1832 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #1678 from phil-davis/patch-1 | Renato Botelho | 2015-05-25 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Consistent clear_subsystem_dirty after unbound restart | Phil Davis | 2015-05-23 | 1 | -1/+2 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | from services_dhcp. This looks like it is wanting curlies to put all clear_subsytem_dirty inside the "if". | |||||
* | | | | | | | Merge pull request #1677 from phil-davis/vpn_ipsec | Renato Botelho | 2015-05-25 | 7 | -650/+890 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Code style VPN IPsec | Phil Davis | 2015-05-23 | 7 | -650/+890 | |
| |/ / / / / / | ||||||
* | | | | | | | Code style www vpn_openvpn | Phil Davis | 2015-05-23 | 3 | -411/+629 | |
|/ / / / / / | ||||||
* | | | | | | Update/correct wireless status flags and capabilities list. | jim-p | 2015-05-22 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | There are many more possible flags, documented on the wiki: https://doc.pfsense.org/index.php/Wireless_Status | |||||
* | | | | | | Merge pull request #1673 from phil-davis/patch-2 | Renato Botelho | 2015-05-22 | 1 | -10/+21 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Be smarter about combinations of combinedfields and usecolspan2 | Phil Davis | 2015-05-22 | 1 | -10/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a) When we are doing combined fields and usecolspan2 is in effect, then usecolspan2 is also a signal that we want to spread the combined fields horizontally in a single row. In that case we want the combined fields to all be in a single "tr" tag enclosing them all. That was already working in that way. b) But if usecolspan2 is NOT in effect, then we want the combined fields to still run "together" but vertically under each other. In this case we want each field to be in its own "tr" tag. This change makes (b) happen. If combinedfields is not set, then each of the "if" tests here still follows the same path it did previously, so there should be no effect on the HTML output for any ordinary package fields. These are changes for master that correspond to https://github.com/pfsense/pfsense/pull/1672 on RELENG_2_2. | |||||
* | | | | | | | Code style vpn_pppoe | Phil Davis | 2015-05-22 | 2 | -120/+170 | |
|/ / / / / / | ||||||
* | | | | | | Update zoneinfo from FreeBSD 10.1-REL. Ticket #4459 | Chris Buechler | 2015-05-21 | 1 | -0/+0 | |
| | | | | | | ||||||
* | | | | | | Correct descriptions on Key Rotation and Master Key Regeneration for wireless. | jim-p | 2015-05-21 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | More combinedfields and usecolspan2 fixes | Phil Davis | 2015-05-20 | 1 | -4/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually the "tr" tag needs to be a single tag-pair that encloses all of the set of fields with combinedfields specified - combinedfields=begin is where the "tr" tag starts and combinedfields=end is where the "tr" tag ends, enclosing a whole set of combined fields. That allows usecolspan2 to work. In the previous change I had made it enclose every field in its own "tr" tag-pair That caused usecolspan2 to be ineffective at spreading the combined fields across the display. Also colspan needs to be initialised each time around the loop - it was getting applied to all fields further down the page after the first one it was used in. This is the version for master. | |||||
* | | | | | | Fix tr use for combinedfields in pkg xml | Phil Davis | 2015-05-20 | 1 | -5/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When specifying combinedfields begin and end in a package XML file, IE reports some unexpected start tag messages. This is because some "td" tags are not enclosed in "tr" tags in these cases, both at the begin and end of the combinedfields table that is generated. Firefox seems to be forgiving of this. This has been investigated because BBscan177 who is developing pfBlockerNG is trying to use the combinedfields feature and it was not working so well. I will ask him to try these changes for RELENG_2_2 and confirm that they work. When combinedfields is not set, then the code path with this change results in the same HTML being output as previously, so it should not change the HTML generated for packages that do not use combinedfields - i.e. I claim not to have broken anything else :) | |||||
* | | | | | | Too many left curlies in pkg_edit.php | Phil Davis | 2015-05-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | I broke the syntax! | |||||
* | | | | | | Merge pull request #1662 from phil-davis/www-pkg | Renato Botelho | 2015-05-19 | 6 | -966/+1151 | |
|\ \ \ \ \ \ |