Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into inc | Vinicius Coque | 2011-01-28 | 1 | -6/+6 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/captiveportal.inc etc/inc/config.console.inc etc/inc/config.lib.inc etc/inc/easyrule.inc etc/inc/filter.inc etc/inc/ipsec.inc etc/inc/pkg-utils.inc etc/inc/shaper.inc etc/inc/system.inc etc/inc/voucher.inc | ||||
| * | Make allowedhostname an array. | Scott Ullrich | 2011-01-25 | 1 | -3/+3 |
| | | |||||
| * | Add the npt tag which is used by the IPv6 tree to the 2.0 mainline tree. | smos | 2011-01-24 | 1 | -2/+2 |
| | | | | | | | | This prevents a config blowup when a ipv6 config loads on 2.0. | ||||
| * | Also CDATA protect the detail field. Fixes #1168 | jim-p | 2011-01-06 | 1 | -2/+2 |
| | | |||||
* | | Merge remote branch 'mainline/master' into inc | Vinicius Coque | 2010-12-14 | 1 | -4/+11 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/filter.inc etc/inc/gwlb.inc etc/inc/interfaces.inc etc/inc/pfsense-utils.inc etc/inc/pkg-utils.inc etc/inc/shaper.inc etc/inc/upgrade_config.inc etc/inc/xmlparse.inc usr/local/www/fbegin.inc | ||||
| * | Print file name when logging an xml error. | jim-p | 2010-11-30 | 1 | -2/+3 |
| | | |||||
| * | Check for pfsense root object name in config.xml as a fallback if the ↵ | Erik Fonnesbeck | 2010-11-26 | 1 | -3/+9 |
| | | | | | | | | configured name is not found. | ||||
| * | Remove trailing carriage return | Scott Ullrich | 2010-11-10 | 1 | -1/+1 |
| | | |||||
* | | Fix quotes to use %N$X on gettext calls | Renato Botelho | 2010-10-01 | 1 | -2/+2 |
| | | |||||
* | | Merge remote branch 'mainline/master' into inc | Renato Botelho | 2010-09-08 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | | | | | | | Conflicts: etc/inc/filter.inc etc/inc/pkg-utils.inc etc/inc/service-utils.inc etc/inc/system.inc etc/inc/vpn.inc | ||||
| * | Make possible to run multiple instances of pppoe server. Not yet switched to ↵ | Ermal | 2010-09-02 | 1 | -1/+1 |
| | | | | | | | | mpd4. | ||||
* | | Fix gettext calls with printf to permit change strings order | Renato Botelho | 2010-08-30 | 1 | -2/+2 |
| | | |||||
* | | Merge remote branch 'mainline/master' into inc | Renato Botelho | 2010-08-30 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | Conflicts: etc/inc/captiveportal.inc | ||||
| * | Add crl as a listtag | jim-p | 2010-08-30 | 1 | -1/+1 |
| | | |||||
* | | Implement gettext() calls on xmlparse.inc | Renato Botelho | 2010-08-17 | 1 | -4/+4 |
|/ | |||||
* | Do not call die while parsing package xml files. Instead return an empty ↵ | Ermal | 2010-08-06 | 1 | -2/+2 |
| | | | | array. This should avoid packages not uninstalling. | ||||
* | Remove trailing newline | Scott Ullrich | 2010-07-27 | 1 | -1/+1 |
| | |||||
* | Adding build_port_path | Scott Ullrich | 2010-07-18 | 1 | -2/+2 |
| | |||||
* | Separate regdomain.xml parsing back to a separate file, so it can be used ↵ | Erik Fonnesbeck | 2010-07-10 | 1 | -40/+1 |
| | | | | when xmlreader.inc is used instead of xmlparse.inc | ||||
* | Ticket #612. Correctly show the number of users as 0 on a group with no ↵ | Ermal | 2010-05-24 | 1 | -9/+13 |
| | | | | users. Also handle the case of empty arrays on the xmlparser. | ||||
* | Do not aritificially add spaces around values on CDATA fields. Tested-by: Jim | Ermal | 2010-05-20 | 1 | -2/+2 |
| | |||||
* | Encode/decode special characters with htmlentities/html_entity_decode combo ↵ | Ermal | 2010-05-18 | 1 | -4/+9 |
| | | | | to make the parser not bail on special characters. | ||||
* | Make list the same. Remove whitespace at the end so it does not get ↵ | Ermal | 2010-05-07 | 1 | -1/+1 |
| | | | | interpreted as special tag. | ||||
* | Fix parsign of packages xml. | Ermal | 2010-03-19 | 1 | -1/+4 |
| | |||||
* | Ticket #434. Do not die when parsing config since we know how to recover. ↵ | Ermal | 2010-03-19 | 1 | -3/+6 |
| | | | | Only die during packages. | ||||
* | Restore attribute support, but with some extra checks in the function that ↵ | Erik Fonnesbeck | 2010-03-16 | 1 | -1/+40 |
| | | | | uses it. | ||||
* | Needs a little more testing; revert attribute support in xmlparse.inc for now. | Erik Fonnesbeck | 2010-03-16 | 1 | -35/+1 |
| | | | | This reverts commit 2843a3ec5d4a160646e496f3922266415151902a. | ||||
* | Add optional support for reading attributes to xmlparse.inc and move ↵ | Erik Fonnesbeck | 2010-03-16 | 1 | -1/+35 |
| | | | | regdomain.xml parsing from regdomain.inc to xmlparse.inc. | ||||
* | Add skip white space. To avoid erroring out on accidental blank space. | Ermal Luçi | 2010-03-08 | 1 | -0/+1 |
| | |||||
* | Merge commit 'mainline/master' | Erik Fonnesbeck | 2010-03-01 | 1 | -0/+4 |
|\ | |||||
| * | Prevent empty tags of creating <tag></tag> entries but instead just create ↵ | Ermal Luçi | 2010-02-24 | 1 | -0/+4 |
| | | | | | | | | them as <tag/> to be consistent. This fixes some empty arrays problems on the code. | ||||
* | | Add page for configuration of wireless clone interfaces. | Erik Fonnesbeck | 2010-02-15 | 1 | -4/+4 |
|/ | |||||
* | Adding newer xmlreader code to it's own file so that it can be turned and ↵ | Scott Ullrich | 2009-11-06 | 1 | -52/+104 |
| | | | | off until remaining bugs are fixed | ||||
* | Add pfSense_BUILDER_BINARIES: and pfSense_MODULE: additions | Scott Ullrich | 2009-09-12 | 1 | -0/+4 |
| | |||||
* | Seems we need even CDATA handling since it is used through packages. | Ermal Luçi | 2009-09-09 | 1 | -0/+1 |
| | |||||
* | If it is supposed to be an array then make sure it has the array type. This ↵ | Ermal Luçi | 2009-09-09 | 1 | -1/+4 |
| | | | | fixes wireless configuration problems at least. | ||||
* | Test if we actually succeeded in opening the requested xml file and log an ↵ | Ermal Luçi | 2009-08-24 | 1 | -5/+5 |
| | | | | error in bad cases to avoid strange errors. | ||||
* | Micro speedup improvements on the parser. | Ermal Luçi | 2009-08-13 | 1 | -11/+9 |
| | |||||
* | Change the parser to xmlreader instead of the current parser. This brings ↵ | Ermal Luçi | 2009-08-12 | 1 | -96/+38 |
| | | | | speed improvements and reduces some of the errors of the previous parser. | ||||
* | Revert "Rename cvssync to gitsync" | Scott Ullrich | 2009-06-18 | 1 | -2/+1 |
| | | | | This reverts commit 62b035ce5f41c8342f0eea0b78e5878ff467e525. | ||||
* | Rename cvssync to gitsync | Scott Ullrich | 2009-06-18 | 1 | -1/+2 |
| | |||||
* | Port voucher login ability on CaptivePortal from M0n0Wall. | Charlie | 2009-06-13 | 1 | -1/+1 |
| | | | | Various locking fixes are done with the import and this means that as of now pfSense has a better performin/behaving CP than m0n0wall. | ||||
* | Bring in support for QinQ. At this time it is limited to only 2 levels. | Ermal Luçi | 2009-03-28 | 1 | -1/+1 |
| | |||||
* | * Introduce interface groups. For now they are availble only on ↵ | Ermal Luçi | 2009-03-16 | 1 | -2/+3 |
| | | | | | | Firewall:Rules section maybe it would be usable to have tham on nat too. * Some fixes and cleanup. | ||||
* | Add GIT array type rrddatafile | Scott Ullrich | 2009-03-12 | 1 | -1/+1 |
| | |||||
* | Unbreak igmpproxy by making known to the parser that we have IGMP too now. | Ermal Luci | 2009-02-01 | 1 | -1/+1 |
| | |||||
* | This patch adds the initial support for layer7 protocol inspection gui. | Helder Pereira | 2008-12-20 | 1 | -2/+2 |
| | |||||
* | Make it possible for pakages to insert additional tabbed pages into an | Matthew Grooms | 2008-09-16 | 1 | -1/+1 |
| | | | | | | | | existing tab group. This requires that each page in the tab group call add_package_tabs() with the tab group name before display_top_tabs() so pages can be inserted. While far from optimal, this system is really a stop-gap measure until a more intelligent menu/tab system can be implemented. Discussed with Scott on IRC. | ||||
* | Correct a typo that could cause problems for openvpn if a client specific | Matthew Grooms | 2008-08-30 | 1 | -1/+1 |
| | | | | | override existed. A space was omitted in the listtags array which was causing the openvpn-csc tag to be merged with the following field. | ||||
* | Bring in relay options for inbound load balancer | Bill Marquette | 2008-08-28 | 1 | -11/+15 |
| | | | | | More work pending, this seems to generate proper configs needs much more testing though |