Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainline/master' into 4_load_balancer_and_services | Renato Botelho | 2010-08-03 | 88 | -780/+1607 |
|\ | | | | | | | | | | | | | | | | | Conflicts: usr/local/www/services_captiveportal_ip_edit.php usr/local/www/services_captiveportal_mac_edit.php usr/local/www/services_dhcp_edit.php usr/local/www/services_rfc2136.php usr/local/www/services_snmp.php | ||||
| * | Prevent enabling static ARP if there are static map entries that lack IP ↵ | jim-p | 2010-08-03 | 1 | -0/+7 |
| | | | | | | | | addresses. | ||||
| * | Fix this variable name and error message (It's Static ARP not Static map) | jim-p | 2010-08-03 | 1 | -3/+3 |
| | | |||||
| * | Add reference instead of copying also remove bogus comment and code that ↵ | Ermal | 2010-08-03 | 1 | -10/+1 |
| | | | | | | | | relies on interfaces named carp which should not happen anymore. | ||||
| * | Use get_real_interface here and compare to that to make it more generic ↵ | Erik Fonnesbeck | 2010-08-02 | 1 | -1/+1 |
| | | | | | | | | instead of doing this wireless-specific stuff. | ||||
| * | Since convert_friendly_interface_to_friendly_descr is now used for display ↵ | Erik Fonnesbeck | 2010-08-02 | 1 | -2/+2 |
| | | | | | | | | purposes only, it should be fine to fix the case on PPTP and PPPoE. | ||||
| * | Convert outbound NAT rule code to using $FilterIflist for getting alias ↵ | Erik Fonnesbeck | 2010-08-02 | 1 | -3/+3 |
| | | | | | | | | names and fix a case where the wrong name could get into the rule when there is no IP address. | ||||
| * | Change these to lower-case to match the lower-case names from the previous ↵ | Erik Fonnesbeck | 2010-08-02 | 2 | -2/+2 |
| | | | | | | | | revert. | ||||
| * | Revert "Adjust case of aliases/description names for PPTP and PPPoE server ↵ | Erik Fonnesbeck | 2010-08-02 | 2 | -4/+4 |
| | | | | | | | | | | | | interfaces." since it affects a package that is using the pptp alias. This reverts commit 429cac0198aea4c42f815e639fb123157de1861b. | ||||
| * | Optionally sync users and groups via xmlrpc. Fixes #650 | jim-p | 2010-08-02 | 3 | -0/+13 |
| | | |||||
| * | Resync DNS forwarder post-sync. Fixes #117 | jim-p | 2010-08-02 | 1 | -0/+1 |
| | | |||||
| * | Backout this commit, it was never intended to be committed | Scott Ullrich | 2010-08-02 | 1 | -1/+1 |
| | | |||||
| * | Make sure this variable is an array before performing array operations upon it. | jim-p | 2010-08-02 | 1 | -3/+5 |
| | | |||||
| * | Ensure static ARP is configured each time the DHCP service is configured. ↵ | jim-p | 2010-08-02 | 2 | -3/+2 |
| | | | | | | | | Previously, it was not enabled after bootup, but was if saved from the GUI. Fixes #782 | ||||
| * | Hide the interface configuration when WAN or LAN are disabled, just like for ↵ | Erik Fonnesbeck | 2010-08-02 | 1 | -4/+1 |
| | | | | | | | | OPT interfaces. | ||||
| * | Fix typo in interface name. | Erik Fonnesbeck | 2010-08-02 | 1 | -1/+1 |
| | | |||||
| * | Don't create the wireless section of the config for an interface section ↵ | Erik Fonnesbeck | 2010-08-02 | 1 | -2/+2 |
| | | | | | | | | that doesn't exist. | ||||
| * | Actually find the first wireless interface like the code says it is supposed ↵ | Erik Fonnesbeck | 2010-08-02 | 1 | -1/+3 |
| | | | | | | | | to do, rather than finding the last. | ||||
| * | Make convert_real_interface_to_friendly_interface_name recognize that the ↵ | Erik Fonnesbeck | 2010-08-02 | 1 | -0/+3 |
| | | | | | | | | parent wireless name in the config means the same as the #0 clone. Fixes a bug in is_interface_wireless that could cause it to create a blank interface entry. | ||||
| * | The pipe character is not valid for the interface description, so don't ↵ | Erik Fonnesbeck | 2010-08-02 | 1 | -1/+1 |
| | | | | | | | | consider it valid. ( | is not an "or" in regular expression character classes) | ||||
| * | The pipe character is not valid for the interface description, so don't ↵ | Erik Fonnesbeck | 2010-08-02 | 1 | -1/+1 |
| | | | | | | | | consider it valid in the regular expression. | ||||
| * | Update the VPN names in the reserved keywords list for aliases. | Erik Fonnesbeck | 2010-08-01 | 2 | -2/+2 |
| | | |||||
| * | Adjust case of aliases/description names for PPTP and PPPoE server interfaces. | Erik Fonnesbeck | 2010-08-01 | 2 | -4/+4 |
| | | |||||
| * | Correct capitalization for PPTP and L2TP in a couple places. | Erik Fonnesbeck | 2010-08-01 | 2 | -6/+6 |
| | | |||||
| * | Set the timezone if available. This will minimize calls to the system for ↵ | Scott Ullrich | 2010-08-02 | 1 | -2/+6 |
| | | | | | | | | tz data and should not have any negative side-effects. | ||||
| * | Fix interface name display for various cases on NAT rule listings. | Erik Fonnesbeck | 2010-08-01 | 3 | -15/+9 |
| | | |||||
| * | Small optimization for convert_friendly_interface_to_friendly_descr. Do not ↵ | Erik Fonnesbeck | 2010-08-01 | 1 | -0/+7 |
| | | | | | | | | build an interface list for the most common cases. | ||||
| * | Unbreal exclam.gif | Scott Ullrich | 2010-08-01 | 1 | -2/+2 |
| | | |||||
| * | Do not set tabcont class | Scott Ullrich | 2010-08-01 | 1 | -2/+2 |
| | | |||||
| * | No need to set a class on these items | Scott Ullrich | 2010-08-01 | 1 | -2/+2 |
| | | |||||
| * | Use exclam.gif | Scott Ullrich | 2010-08-01 | 1 | -3/+3 |
| | | |||||
| * | Only enable ZFS mode if /boot/gptzfsboot exists | Scott Ullrich | 2010-08-01 | 1 | -15/+17 |
| | | |||||
| * | Use product_name | Scott Ullrich | 2010-08-01 | 1 | -9/+10 |
| | | |||||
| * | WAN and LAN don't need to be specially added to $specialnets, since the code ↵ | Erik Fonnesbeck | 2010-08-01 | 1 | -2/+2 |
| | | | | | | | | after can add them anyway. | ||||
| * | Handle errors | Scott Ullrich | 2010-08-01 | 1 | -4/+46 |
| | | |||||
| * | Adding ZFS | Scott Ullrich | 2010-08-01 | 1 | -4/+14 |
| | | |||||
| * | Check to see if we are already installed | Scott Ullrich | 2010-08-01 | 1 | -0/+2 |
| | | |||||
| * | Missing \n | Scott Ullrich | 2010-08-01 | 1 | -1/+1 |
| | | |||||
| * | Only check for file if install is complete | Scott Ullrich | 2010-08-01 | 1 | -5/+4 |
| | | |||||
| * | Show all log contents and automatically scroll to end of textarea | Scott Ullrich | 2010-08-01 | 1 | -1/+2 |
| | | |||||
| * | Ensure /tmp exists | Scott Ullrich | 2010-08-01 | 1 | -0/+1 |
| | | |||||
| * | Handle umount outside of installer in php | Scott Ullrich | 2010-08-01 | 1 | -2/+2 |
| | | |||||
| * | Fix display of optX addresses in rule lists. | Erik Fonnesbeck | 2010-08-01 | 1 | -5/+2 |
| | | |||||
| * | Handle umount outside of installer in php | Scott Ullrich | 2010-08-01 | 1 | -1/+1 |
| | | |||||
| * | Do not umount | Scott Ullrich | 2010-08-01 | 2 | -16/+20 |
| | | |||||
| * | Do not kick off a install if we have already completed | Scott Ullrich | 2010-08-01 | 1 | -0/+2 |
| | | |||||
| * | More installer improvements. Its looking hot! | Scott Ullrich | 2010-08-01 | 1 | -5/+31 |
| | | |||||
| * | Silence error as we do not use this | Scott Ullrich | 2010-08-01 | 1 | -2/+2 |
| | | |||||
| * | Progress bar now works, installer looks pretty slick! | Scott Ullrich | 2010-08-01 | 1 | -64/+72 |
| | | |||||
| * | Don't use WAN/LAN if an interface descr exists ticket #783 | Chris Buechler | 2010-08-01 | 1 | -2/+2 |
| | |