pfsense - Raptor Engineering's fork of the main repository for pfSense

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use updated get_memory var names	Phil Davis	2013-09-02	1	-3/+4
\| \| \|	Backport to 2.1
*	Merge git pull request 313 from bcyrill with some modifications	Ermal	2013-01-16	1	-1/+1
\|
*	Fixup gettext/printf call.	jim-p	2012-11-19	1	-1/+1
\|
*	Change ereg() to preg_match() function	ccesario	2012-06-30	1	-1/+1
\|
*	Fixes #2490. If there is a descr set on the interface keep it and do not ↵	Ermal	2012-06-11	1	-3/+5
\| \| \| \|	disable the iface
*	fix for bug #2469 ("WAN -> LAN -> OPT10")	Darren Embry	2012-06-07	1	-2/+2
\|
*	Good catch jim :)	Ermal	2012-04-04	1	-1/+1
\|
*	Just php does not like this variable name and just prepends the 1 in output!	Ermal	2012-04-04	1	-6/+6
\|
*	Merge remote-tracking branch 'mainline/master' into inc	Vinicius Coque	2011-04-15	1	-2/+2
\|\ \| \| \| \| \| \| \| \|	Conflicts: etc/inc/gwlb.inc
\| *	Save a little space on the interface list for console assignment.	jim-p	2011-04-14	1	-2/+2
\| \|
* \|	Merge remote-tracking branch 'mainline/master' into inc	Vinicius Coque	2011-03-25	1	-2/+2
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: etc/inc/interfaces.inc etc/inc/priv.defs.inc etc/inc/shaper.inc etc/inc/system.inc
\| *	Change wording	smos	2011-03-16	1	-2/+2
\| \|
* \|	Merge remote-tracking branch 'mainline/master' into inc	Vinicius Coque	2011-03-25	1	-1/+1
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/filter.inc etc/inc/pfsense-utils.inc etc/inc/pkg-utils.inc etc/inc/priv.defs.inc etc/inc/services.inc etc/inc/shaper.inc etc/inc/voucher.inc etc/inc/vpn.inc usr/local/www/fbegin.inc
\| *	Resolves #1265. Show the interfaces in the same order requested during ↵	Ermal	2011-02-08	1	-1/+1
\| \| \| \| \| \| \| \|	assignment on console.
* \|	BP: Fix gettext implementation	Vinicius Coque	2011-02-08	1	-1/+1
\| \|
* \|	Merge branch 'master' into inc	Vinicius Coque	2011-01-28	1	-10/+10
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Add some more safe belts and remove code that is commented from long time ↵	Ermal	2010-12-23	1	-10/+10
\| \| \| \| \| \| \| \|	now. Reported on http://forum.pfsense.org/index.php/topic,28202.15.html
* \|	Merge remote branch 'mainline/master' into inc	Vinicius Coque	2010-12-14	1	-1/+1
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Use pfSense_sync()	Scott Ullrich	2010-11-30	1	-1/+1
\| \|
* \|	More gettext fixes	Renato Botelho	2010-10-01	1	-1/+1
\| \|
* \|	Implement gettext() calls on config.console.inc	Carlos Eduardo Ramos	2010-08-16	1	-32/+32
\|/
*	Show disabled interfaces as well	Scott Ullrich	2010-08-09	1	-6/+9
\|
*	Adding config.console.inc	Scott Ullrich	2010-08-09	1	-0/+535