summaryrefslogtreecommitdiffstats
path: root/etc/inc/config.gui.inc
Commit message (Collapse)AuthorAgeFilesLines
* Resolve merge conflictScott Ullrich2011-03-061-4/+0
|\
| * Not needed anymore.Ermal2011-03-031-5/+1
| |
* | Merge remote branch 'upstream/master'Seth Mos2011-01-201-5/+0
|\ \ | |/ | | | | | | Conflicts: etc/inc/system.inc
| * No need to set this here, we already set it in config.inc (and it takes ↵jim-p2011-01-181-5/+0
| | | | | | | | precedence)
* | Merge remote branch 'upstream/master'Seth Mos2010-12-201-3/+3
|\ \ | |/ | | | | | | | | | | Conflicts: etc/inc/interfaces.inc etc/inc/vslb.inc usr/local/www/interfaces.php
| * Use pfSense_sync()Scott Ullrich2010-11-301-1/+1
| |
| * Nuke trailing c/rScott Ullrich2010-11-241-1/+1
| |
| * Hopefully now the reinclusion of config will not override vars.Ermal2010-11-191-3/+3
| |
* | Allow for creation of a ipv6 tunnel for he.net by creating a gif interface. ↵Seth Mos2010-10-261-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 Ullrich2010-08-091-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çi2010-03-051-0/+2
|
* Move newer xmlreader code to xmlreader.inc. Restore old xmlparse code to ↵Scott Ullrich2009-11-061-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 ↵Erik2009-10-071-0/+90
code being parsed anymore in webgui now)
OpenPOWER on IntegriCloud