| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Remove extra "/" | Warren Baker | 2011-07-13 | 1 | -1/+1 |
| | | |||||
| * | Fix merge conflict | jim-p | 2011-07-13 | 1 | -4/+0 |
| | | |||||
| * | Merge pull request #5 from smos/master | Jim P | 2011-07-13 | 29 | -378/+1993 |
| |\ | | | | | Welcome IPv6! | ||||
| | * | Merge remote-tracking branch 'upstream/master' | jim-p | 2011-07-12 | 41 | -1297/+1327 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/easyrule.inc etc/inc/filter.inc etc/inc/interfaces.inc etc/inc/services.inc etc/inc/xmlrpc_client.inc usr/local/www/fbegin.inc usr/local/www/services_dhcp.php | ||||
| | * \ | Merge remote branch 'upstream/master' | jim-p | 2011-07-07 | 3 | -23/+39 |
| | |\ \ | |||||
| | * \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-07-06 | 1 | -0/+21 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-07-06 | 5 | -3/+9 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/version | ||||
| | * \ \ \ \ | Merge remote-tracking branch 'upstream/master' | jim-p | 2011-07-04 | 3 | -5/+36 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | jim-p | 2011-07-02 | 3 | -304/+361 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-07-01 | 8 | -51/+68 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Move apinger monitor reconfigure down after gif, since gif can add gateways. | jim-p | 2011-06-28 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Reconfigure gif so it picks up the new wan ip. | jim-p | 2011-06-28 | 1 | -0/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add he.net tunnelbroker update dyndns type | jim-p | 2011-06-28 | 1 | -0/+40 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge remote branch 'upstream/master' | jim-p | 2011-06-28 | 1 | -3/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-06-27 | 4 | -17/+20 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | jim-p | 2011-06-26 | 4 | -13/+108 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-06-23 | 2 | -3/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-06-22 | 5 | -216/+223 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/filter.inc etc/inc/util.inc | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-06-21 | 6 | -24/+65 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/version | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | jim-p | 2011-06-19 | 3 | -18/+268 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-06-15 | 2 | -6/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-06-15 | 2 | -2/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-06-14 | 5 | -30/+89 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/globals.inc etc/inc/upgrade_config.inc | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | jim-p | 2011-06-11 | 2 | -17/+21 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-06-10 | 3 | -7/+36 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-06-08 | 1 | -2/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-06-08 | 12 | -100/+79 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-06-03 | 6 | -10/+30 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/openvpn.inc | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Add tunable, by default disabled, to enable the default gateway switching ↵ | Ermal | 2011-06-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature when the default one 'disappears'. | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Fix merge blip. | jim-p | 2011-06-01 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'upstream/master' | jim-p | 2011-06-01 | 17 | -209/+426 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: conf.default/config.xml etc/inc/filter.inc etc/inc/globals.inc etc/inc/pfsense-utils.inc etc/inc/upgrade_config.inc usr/local/www/interfaces.php | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Add debugging notes so that we can easily fix this when IPv6 support is ↵ | Seth Mos | 2011-05-26 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added to the pfSense module. Remove the Accept router advertisement from all interfaces unless we enable them | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Fix my traffic graphs | Seth Mos | 2011-05-26 | 1 | -17/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Unset the correct variables | Seth Mos | 2011-05-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Make it so that we use the correct fields in the right order | Seth Mos | 2011-05-24 | 1 | -4/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Apply fix from wallabybob on the forum ↵ | Seth Mos | 2011-05-24 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://forum.pfsense.org/index.php/topic,37079.0.html | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Also process v4 gateways on v4 gif tunnels | Seth Mos | 2011-05-23 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | When editing a gif interface with a gateway we need to call ↵ | Seth Mos | 2011-05-23 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system_routing_configure() for that gif interface. | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Test the right variable otherwise we have no hope of getting a v6 gateway | Seth Mos | 2011-05-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Further fine tune the gif tunnel default route commands. | Seth Mos | 2011-05-21 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Comment out the interface_gif_configure(). It is causing more issues then it ↵ | Seth Mos | 2011-05-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is solving. | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Run system_routing_configure() for all the gif interfaces when the parent ↵ | Seth Mos | 2011-05-21 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interfaces renews. | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Do not use global router advertisements, instead configure per interface. | Seth Mos | 2011-05-20 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'upstream/master' | jim-p | 2011-05-20 | 3 | -14/+27 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-05-19 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-05-19 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: conf.default/config.xml | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | jim-p | 2011-05-19 | 11 | -70/+206 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves #1529. Check if the file exists before opening it. | Ermal | 2011-05-16 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove onlink flags | Seth Mos | 2011-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into smos-ipv6 | Bill Marquette | 2011-05-14 | 6 | -4/+83 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/pfsense-utils.inc | ||||
 |
index : pfsense | |
| Raptor Engineering's fork of the main repository for pfSense | Raptor Engineering, LLC |
| summaryrefslogtreecommitdiffstats |
|