Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve merge conflict | Scott Ullrich | 2011-03-06 | 1 | -4/+0 |
|\ | |||||
| * | Not needed anymore. | Ermal | 2011-03-03 | 1 | -5/+1 |
| | | |||||
* | | Merge remote branch 'upstream/master' | Seth Mos | 2011-01-20 | 1 | -5/+0 |
|\ \ | |/ | | | | | | | Conflicts: etc/inc/system.inc | ||||
| * | No need to set this here, we already set it in config.inc (and it takes ↵ | jim-p | 2011-01-18 | 1 | -5/+0 |
| | | | | | | | | precedence) | ||||
* | | Merge remote branch 'upstream/master' | Seth Mos | 2010-12-20 | 1 | -3/+3 |
|\ \ | |/ | | | | | | | | | | | Conflicts: etc/inc/interfaces.inc etc/inc/vslb.inc usr/local/www/interfaces.php | ||||
| * | Use pfSense_sync() | Scott Ullrich | 2010-11-30 | 1 | -1/+1 |
| | | |||||
| * | Nuke trailing c/r | Scott Ullrich | 2010-11-24 | 1 | -1/+1 |
| | | |||||
| * | Hopefully now the reinclusion of config will not override vars. | Ermal | 2010-11-19 | 1 | -3/+3 |
| | | |||||
* | | Allow for creation of a ipv6 tunnel for he.net by creating a gif interface. ↵ | Seth Mos | 2010-10-26 | 1 | -1/+2 |
|/ | | | | | | This is the recommended procedure as advised by he.net This allows for using ipv6 local and remote addresses, you will need to add a ipv6 default gateway on the routing tab | ||||
* | Move all console related configuration items to config.console.inc. This ↵ | Scott Ullrich | 2010-08-09 | 1 | -4/+4 |
| | | | | will mean that these items are not included when the webConfigurator is being used and only on bootup on the console. | ||||
* | Propperly initialize variables so they function is as expected. | Ermal Luçi | 2010-03-05 | 1 | -0/+2 |
| | |||||
* | Move newer xmlreader code to xmlreader.inc. Restore old xmlparse code to ↵ | Scott Ullrich | 2009-11-06 | 1 | -1/+4 |
| | | | | xmlparse.inc. Default to the older xmlparse.inc but add a flag check if /cf/conf/use_xmlreader is present the newer code will be included instead until the remaining bugs can be resolved with it (see rcs for many). | ||||
* | create a config include that just presents $config to the webgui (no boot ↵ | Erik | 2009-10-07 | 1 | -0/+90 |
code being parsed anymore in webgui now) |