summaryrefslogtreecommitdiffstats
path: root/usr
Commit message (Collapse)AuthorAgeFilesLines
...
* | Code style services unboundPhil Davis2015-05-285-331/+420
| |
* | Merge pull request #1471 from Talyrius/masterRenato Botelho2015-05-282-2/+42
|\ \
| * | Add RTMP to the Traffic ShaperTalyrius2015-02-042-2/+42
| | |
* | | L7 protocols: add rtmp, sync bittorrent, finger and quake-halflife with ↵Renato Botelho2015-05-284-4/+22
| | | | | | | | | | | | l7-protocols
* | | Merge pull request #1444 from oliwel/feature/easyrule-unblockRenato Botelho2015-05-281-2/+21
|\ \ \
| * | | Fix comment styleOliver Welter2015-05-271-3/+3
| | | |
| * | | Merge branch 'master' into feature/easyrule-unblockOliver Welter2015-03-03113-363/+574
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/easyrule.inc
| * | | | Derive name from easyrule block alias from the scripts nameOliver Welter2015-01-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Allows to use different block lists by using symlinks to the easyrule CLI script
| * | | | Add showblock and unblock options to easyrule CLI toolOliver Welter2015-01-181-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/masterRenato Botelho2015-05-281-1/+2
|\ \ \ \ \
| * | | | | Added the Stateless DHCP Dropdown hereaqueeb2014-03-221-1/+2
| | | | | |
* | | | | | Code style services r s wPhil Davis2015-05-274-580/+639
| | | | | |
* | | | | | Merge pull request #1081 from PiBa-NL/cert_usageErmal LUÇI2015-05-271-0/+21
|\ \ \ \ \ \
| * | | | | | add is_array safety checkPiBa-NL2014-04-131-0/+2
| | | | | | |
| * | | | | | Certificate Manager, call packages plugin function to show used certificatesPiBa-NL2014-04-131-0/+19
| | | | | | |
* | | | | | | Code style www diag more bitsPhil Davis2015-05-2728-721/+796
| | | | | | |
* | | | | | | Code style diag logs againPhil Davis2015-05-2617-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 logPhil Davis2015-05-261-2/+2
| | | | | | | | | | | | | | | | | | | | | Bug #4730 - the code was not there yet.
* | | | | | | Call htmlspecialchars() to remove dangerouns chars from zone parameter. Also ↵Renato Botelho2015-05-251-3/+3
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | redirect user to services_captiveportal_zones.php when an invalid zone is passed
* | | | | | Merge pull request #1686 from phil-davis/service-rfc2136Renato Botelho2015-05-252-226/+271
|\ \ \ \ \ \
| * | | | | | Code style services RFC2136Phil Davis2015-05-242-226/+271
| | | | | | |
* | | | | | | Merge pull request #1685 from phil-davis/services-ntpRenato Botelho2015-05-253-568/+658
|\ \ \ \ \ \ \
| * | | | | | | Code style services NTPPhil Davis2015-05-243-568/+658
| |/ / / / / /
* | | | | | | Merge pull request #1684 from phil-davis/services-igmpRenato Botelho2015-05-252-205/+235
|\ \ \ \ \ \ \
| * | | | | | | Code style services igmpproxyPhil Davis2015-05-242-205/+235
| |/ / / / / /
* | | | | | | Merge pull request #1683 from phil-davis/www-services-dyndnsRenato Botelho2015-05-252-331/+379
|\ \ \ \ \ \ \
| * | | | | | | Code style services dyndnsPhil Davis2015-05-242-331/+379
| |/ / / / / /
* | | | | | | Merge pull request #1682 from phil-davis/www-services-dnsmasqRenato Botelho2015-05-253-362/+485
|\ \ \ \ \ \ \
| * | | | | | | Code style services dnsmasqPhil Davis2015-05-243-362/+485
| |/ / / / / /
* | | | | | | Merge pull request #1681 from phil-davis/patch-2Renato Botelho2015-05-251-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Unbalanced td tag in services_dnsmasqPhil Davis2015-05-241-0/+1
| |/ / / / / /
* | | | | | | Merge pull request #1680 from phil-davis/www-services-cpRenato Botelho2015-05-2512-1429/+1783
|\ \ \ \ \ \ \
| * | | | | | | Code style www services captive portalPhil Davis2015-05-2412-1429/+1783
| |/ / / / / /
* | | | | | | Merge pull request #1679 from phil-davis/services_dhcpRenato Botelho2015-05-256-1526/+1832
|\ \ \ \ \ \ \
| * | | | | | | Code style services DHCPPhil Davis2015-05-236-1526/+1832
| |/ / / / / /
* | | | | | | Merge pull request #1678 from phil-davis/patch-1Renato Botelho2015-05-251-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Consistent clear_subsystem_dirty after unbound restartPhil Davis2015-05-231-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_ipsecRenato Botelho2015-05-257-650/+890
|\ \ \ \ \ \ \
| * | | | | | | Code style VPN IPsecPhil Davis2015-05-237-650/+890
| |/ / / / / /
* | | | | | | Code style www vpn_openvpnPhil Davis2015-05-233-411/+629
|/ / / / / /
* | | | | | Update/correct wireless status flags and capabilities list.jim-p2015-05-221-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-2Renato Botelho2015-05-221-10/+21
|\ \ \ \ \ \
| * | | | | | Be smarter about combinations of combinedfields and usecolspan2Phil Davis2015-05-221-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_pppoePhil Davis2015-05-222-120/+170
|/ / / / / /
* | | | | | Update zoneinfo from FreeBSD 10.1-REL. Ticket #4459Chris Buechler2015-05-211-0/+0
| | | | | |
* | | | | | Correct descriptions on Key Rotation and Master Key Regeneration for wireless.jim-p2015-05-211-2/+2
| | | | | |
* | | | | | More combinedfields and usecolspan2 fixesPhil Davis2015-05-201-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 xmlPhil Davis2015-05-201-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.phpPhil Davis2015-05-191-1/+1
| | | | | | | | | | | | | | | | | | I broke the syntax!
* | | | | | Merge pull request #1662 from phil-davis/www-pkgRenato Botelho2015-05-196-966/+1151
|\ \ \ \ \ \
OpenPOWER on IntegriCloud