Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'upstream/master' | Seth Mos | 2011-01-26 | 43 | -633/+1415 |
|\ | | | | | | | | | Conflicts: etc/inc/system.inc | ||||
| * | Silence warnings. | Ermal | 2011-01-26 | 1 | -2/+2 |
| | | |||||
| * | Fix case for disabling RRD graphing for spamd package. | Erik Fonnesbeck | 2011-01-25 | 1 | -1/+1 |
| | | |||||
| * | Setup textdumps too while we're at it. Handy. | jim-p | 2011-01-25 | 1 | -0/+9 |
| | | |||||
| * | Fix exec bits on rc.dumpon | jim-p | 2011-01-25 | 1 | -0/+0 |
| | | |||||
| * | Redirect to correct page | Scott Ullrich | 2011-01-25 | 1 | -2/+2 |
| | | |||||
| * | Add support for dumpon/savecore to run on full installs. | jim-p | 2011-01-25 | 2 | -0/+49 |
| | | |||||
| * | Whitespace fix | jim-p | 2011-01-25 | 1 | -2/+2 |
| | | |||||
| * | Redirect to correct page | Scott Ullrich | 2011-01-25 | 1 | -1/+1 |
| | | |||||
| * | Restart lighty captive portal after sync | Scott Ullrich | 2011-01-25 | 1 | -0/+2 |
| | | |||||
| * | Transform PORTAL_REDIRURL variable | Scott Ullrich | 2011-01-25 | 1 | -0/+8 |
| | | |||||
| * | Fix url. Do not include mod_accesslog twice | Scott Ullrich | 2011-01-25 | 2 | -2/+2 |
| | | |||||
| * | remove single quotes | Scott Ullrich | 2011-01-25 | 1 | -1/+1 |
| | | |||||
| * | Brute force dnswatch kill if needed | Scott Ullrich | 2011-01-25 | 1 | -0/+2 |
| | | |||||
| * | move pre-auth url before after auth url for consistency. | Scott Ullrich | 2011-01-25 | 1 | -7/+7 |
| | | |||||
| * | Set form field type, make URL boxes same size | Scott Ullrich | 2011-01-25 | 1 | -1/+1 |
| | | |||||
| * | move option near the other | Scott Ullrich | 2011-01-25 | 1 | -7/+7 |
| | | |||||
| * | Increase textbox size. Clarify the original Redirection URL purpouse | Scott Ullrich | 2011-01-25 | 1 | -2/+2 |
| | | |||||
| * | Handle PORTAL_REDIRURL variable | Scott Ullrich | 2011-01-25 | 1 | -0/+6 |
| | | |||||
| * | Adding CP pre-authentication redirect URL box | Scott Ullrich | 2011-01-25 | 1 | -1/+9 |
| | | |||||
| * | Launch dnswatch correctly. | Scott Ullrich | 2011-01-25 | 1 | -2/+2 |
| | | |||||
| * | Allowed hostname is now working. Make bw up and down checks a bit more ↵ | Scott Ullrich | 2011-01-25 | 1 | -1/+5 |
| | | | | | | | | strict using intval() and comparing >0. Fix bw and upload checks allowing either to be set. | ||||
| * | Allowed hostname is now working. Make bw up and down checks a bit more ↵ | Scott Ullrich | 2011-01-25 | 1 | -13/+19 |
| | | | | | | | | strict using intval() and comparing >0. Fix bw and upload checks allowing either to be set. | ||||
| * | Misc fixups | Scott Ullrich | 2011-01-25 | 8 | -32/+32 |
| | | |||||
| * | Make allowedhostname an array. | Scott Ullrich | 2011-01-25 | 1 | -3/+3 |
| | | |||||
| * | Prevent drop down menu creation | Scott Ullrich | 2011-01-25 | 6 | -6/+6 |
| | | |||||
| * | Adding switch to prevent dropdown menu creation. | Scott Ullrich | 2011-01-25 | 1 | -7/+4 |
| | | |||||
| * | Adding tab for allowed hostnames | Scott Ullrich | 2011-01-25 | 5 | -0/+5 |
| | | |||||
| * | Adding preliminary version of allowed hostnames. Allowed hostnames function ↵ | Scott Ullrich | 2011-01-25 | 3 | -11/+424 |
| | | | | | | | | similar to allowed IP addresses and permit the captive portal to pass traffic out. An example usage of this is to allow access to a hotel web page freely and then require authentcation hotlinking from this point. | ||||
| * | Fix formatting. Die, VIM, DIE! | Scott Ullrich | 2011-01-25 | 2 | -62/+100 |
| | | |||||
| * | Reformat file. VIM needs to die a flaming death. | Scott Ullrich | 2011-01-25 | 1 | -373/+370 |
| | | |||||
| * | don't show version on this page either, to match the other pages | Chris Buechler | 2011-01-25 | 1 | -2/+2 |
| | | |||||
| * | Comment out this code since it currently segfaults and get_real_interface ↵ | Erik Fonnesbeck | 2011-01-25 | 1 | -0/+4 |
| | | | | | | | | could cause major slowdown here for some configurations. | ||||
| * | Remove extra call to get_real_interface. | Erik Fonnesbeck | 2011-01-25 | 1 | -6/+4 |
| | | |||||
| * | Use the first element of the array instead of the array itself for the ↵ | Erik Fonnesbeck | 2011-01-25 | 1 | -1/+1 |
| | | | | | | | | comparison. | ||||
| * | Revert "I think this is supposed to be get_real_interface too, not ↵ | Erik Fonnesbeck | 2011-01-25 | 1 | -1/+1 |
| | | | | | | | | | | | | get_parent." - This function should not call get_real_interface here to avoid slowdown from recursion. This reverts commit 54ac5d9080c2ea6669af07aa49a5ce660f2ede76. | ||||
| * | Make get_parent_interface return an array to handle MLPPP and make it find ↵ | gnhb | 2011-01-25 | 1 | -28/+69 |
| | | | | | | | | | | | | vlan parents too. Also, update interface_netgraph_needed to handle MLPPP on vlans. | ||||
| * | Add NULL check to wireless functions. | gnhb | 2011-01-25 | 1 | -3/+3 |
| | | | | | | | | | | | | The old interface_translate_type_to_real function used previously would return OPTX if it was passed "OPTX" and OPTX existed but was unassigned, whereas get_real_interface returns NULL, so now we check for NULL. | ||||
| * | I think this is supposed to be get_real_interface too, not get_parent. | gnhb | 2011-01-25 | 1 | -1/+1 |
| | | | | | | | | Revert if I mis-understood. | ||||
| * | Change name of function "interface_translate_type_to_real" to match what ↵ | gnhb | 2011-01-25 | 1 | -9/+11 |
| | | | | | | | | | | | | | | | | | | | | it's doing (or should be doing.) Next commits will change functionality of this function because before now it's identical to "get_real_interface" function (because of bug mentioned below.) Also, replace interface_translate_type_to_real with get_real_interface in two places for wireless functionality. I don't think they expect the result produced by interface_translate_type_to_real. Change from "type" it "ipaddr" in switch statement. "type" isn't a valid field in $config['interfaces'] | ||||
| * | handle alternate xml_rootobj correctly when doing config backups w/RRD data | Chris Buechler | 2011-01-24 | 1 | -3/+3 |
| | | |||||
| * | Resolves #1216. Do not create nat entries on ovpn interfaces. | Ermal | 2011-01-24 | 1 | -0/+2 |
| | | |||||
| * | Warn users a different way if packages are being reinstalled in the ↵ | jim-p | 2011-01-24 | 4 | -2/+33 |
| | | | | | | | | background. Only lock out package pages, still print a giant warning on the others. (Some people were getting stuck in this state http://forum.pfsense.org/index.php/topic,32531.0.html ) | ||||
| * | Actually send a notice even if no default queue could not be found. This ↵ | Ermal | 2011-01-24 | 1 | -1/+5 |
| | | | | | | | | might be serious in some cases. | ||||
| * | Do not put the queue config on the rules if there is no default queue, just ↵ | Ermal | 2011-01-24 | 1 | -7/+17 |
| | | | | | | | | log it. This prevents errors in rules loading which is worse than having no shaper. | ||||
| * | Log the errors we know for not allowing a queue to be added. | Ermal | 2011-01-24 | 1 | -1/+6 |
| | | |||||
| * | Do proper input validation on traffic shaper wizards to not allow empty fiedls. | Ermal | 2011-01-24 | 4 | -87/+87 |
| | | |||||
| * | Properly check empty fields when specifying bandwidth values. | Ermal | 2011-01-24 | 4 | -4/+4 |
| | | |||||
| * | Add the npt tag which is used by the IPv6 tree to the 2.0 mainline tree. | smos | 2011-01-24 | 2 | -4/+4 |
| | | | | | | | | This prevents a config blowup when a ipv6 config loads on 2.0. | ||||
| * | it's 2011 | Chris Buechler | 2011-01-23 | 1 | -1/+1 |
| | |