summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2965 from ↵Stephen Beaver2016-05-161-1/+1
|\ | | | | | | NOYB/Miscellaneous_Textual_Corrections_-_System_/_Advanced_/_Firewall_&_NAT
| * Miscellaneous Textual Corrections - System / Advanced / Firewall & NATNOYB2016-05-151-1/+1
| | | | | | | | Section panel header title.
* | Merge pull request #2964 from phil-davis/patch-3Stephen Beaver2016-05-161-4/+12
|\ \
| * | Make limiters info box work same as By InterfacePhil Davis2016-05-151-4/+12
| |/ | | | | | | | | The info box displayed on Firewall->Shaper, By Interface come down the bottom with and info icon and can be shown/hidden by the user. The similar info box on Firewall->Shaper, Limiters sits in the main body with no info icon and cannot be shown/hidden, but can be dismissed. Make the info box on Firewall->Shaper, Limiters dispaly and owrk the same as on "By Interface".
* | Merge pull request #2963 from phil-davis/patch-2Stephen Beaver2016-05-161-3/+8
|\ \
| * | Customize limiter info messagePhil Davis2016-05-151-3/+8
| |/ | | | | | | The $dn_default_shaper_msg is what is displayed on the Limiters tab. It needs to talk about "limiter" rather than "queue". This code builds up each message using the same base template sentences, inserting "queue" or "limiter" in the appropriate place.
* | Merge pull request #2961 from ↵Stephen Beaver2016-05-161-1/+1
|\ \ | | | | | | | | | NOYB/Miscellaneous_Textual_Corrections_-_System_/_Advanced_/_Networking
| * | Miscellaneous Textual Corrections - System / Advanced / NetworkingNOYB2016-05-141-1/+1
| | |
* | | Merge pull request #2960 from ↵Stephen Beaver2016-05-161-1/+1
|\ \ \ | | | | | | | | | | | | NOYB/Miscellaneous_Textual_Corrections_-_System_/_User_Manager_/_Settings
| * | | Miscellaneous Textual Corrections - System / User Manager / SettingsNOYB2016-05-131-1/+1
| | |/ | |/|
* | | Merge pull request #2954 from NewEraCracker/textual-correctionsStephen Beaver2016-05-163-6/+6
|\ \ \
| * | | Miscellanous Textual Corrections - Add missing dots, normalize caseNewEraCracker2016-05-113-6/+6
| | | |
* | | | Sanitize notice output here as well. Ticket #6154Chris Buechler2016-05-161-2/+2
| | | |
* | | | Correct force updates when chosen. Ticket #6359Chris Buechler2016-05-161-1/+1
| | | |
* | | | Fix script name in error logChris Buechler2016-05-151-1/+1
| | | |
* | | | Fix misspellings.Chris Buechler2016-05-152-4/+4
| |/ / |/| |
* | | Disable ipcomp regardless of config setting to avoid problem. Ticket #6167Chris Buechler2016-05-131-1/+2
| | |
* | | Silence mwexec output. Now that the groupdel actually works, it spams the ↵Chris Buechler2016-05-131-1/+1
| |/ |/| | | | | log when group isn't found. Ticket #6352
* | Make rule_columns_with_alias end params optionalPhil Davis2016-05-131-1/+1
| | | | | | Stops PHP warnings like reported in forum https://forum.pfsense.org/index.php?topic=111768.0
* | Merge pull request #2958 from k-paulius/patch-16Chris Buechler2016-05-131-4/+6
|\ \
| * | Unbound and dnsmasq can both be enabled so restart both if need bek-paulius2016-05-121-4/+6
| | |
* | | Fix scope for IPv6 link local gateway IPs. Ticket #6353Chris Buechler2016-05-131-1/+1
| | |
* | | Handle link local IPv6 gateways and default gateway switching correctly. ↵Chris Buechler2016-05-131-0/+11
|/ / | | | | | | Ticket #6258
* | Merge pull request #2957 from ↵Chris Buechler2016-05-121-1/+1
|\ \ | | | | | | | | | NOYB/Miscellaneous_Textual_Corrections_-_System_Advanced
| * | Miscellaneous Textual Corrections - System AdvancedNOYB2016-05-121-1/+1
| | |
* | | Merge pull request #2956 from ↵Chris Buechler2016-05-121-1/+1
|\ \ \ | | | | | | | | | | | | NOYB/Miscellaneous_Textual_Corrections_-_Services_NTP_PPS
| * | | Miscellaneous Textual Corrections - Services NTP PPSNOYB2016-05-111-1/+1
| | | |
* | | | Don't start unbound in track6 config if system is booting. Add dnsmasq here ↵Chris Buechler2016-05-121-1/+5
| | | | | | | | | | | | | | | | as well. Based on PR 2943. Ticket #6186
* | | | Use -g with groupdel when passing a GID. Ticket #6352Chris Buechler2016-05-121-1/+1
| | | |
* | | | Fixed #6349Stephen Beaver2016-05-121-0/+1
| |/ / |/| | | | | | | | (cherry picked from commit c032a89a890a350540df12a9d2e41b9c7d8efda5)
* | | Use proper IPsec enable test. Fixes #6351jim-p2016-05-121-1/+1
| | |
* | | Add alias display to target host and target port columnsStephen Beaver2016-05-122-11/+46
| | |
* | | Add a safebelt to makesure $cpzone is always in lowercase. Ticket #6278Renato Botelho2016-05-1217-3/+19
| | |
* | | Fix #6278Renato Botelho2016-05-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | $cpzone is always in lowercase, it's used as the array key used in config.xml. Use it in two cases where the $cp['zone'] was being wrongly used: - To find out zoneid - To replace PORTAL_ACTION url
* | | Store notices safely to prevent potential XSS when notices are displayed ↵Chris Buechler2016-05-121-5/+5
| | | | | | | | | | | | locally or by remote systems where they're shipped. Ticket #6154
* | | Fix package_reinstall_all post-upgrade when packages have been removed in ↵Chris Buechler2016-05-121-5/+5
|/ / | | | | | | pre_upgrade. Ticket #6137
* | Merge pull request #2955 from NewEraCracker/upgrade-code-tweakChris Buechler2016-05-113-11/+9
|\ \
| * | Tweak upgrade - Remove unused code and document changes betterNewEraCracker2016-05-113-11/+9
| | | | | | | | | | | | This will ensure a smooth upgrade for those running config 15.4 to any next version.
* | | Prefer index.php over index.html where both exist.Chris Buechler2016-05-111-1/+1
|/ /
* | Only execute remote search operation on first call of get_pkg_info(), this ↵Renato Botelho2016-05-111-0/+18
| | | | | | | | should fix #6177
* | Do not call pkg_update() here since pkg_switch_repo() aldready does itRenato Botelho2016-05-111-2/+0
|/
* Merge pull request #2953 from NewEraCracker/textual-correctionsStephen Beaver2016-05-119-12/+12
|\
| * Miscellanous Textual Corrections - Add missing dots to phrasesNewEraCracker2016-05-119-12/+12
| |
* | Merge branch 'master' of git.pfmechanics.com:pfsense/pfsenseStephen Beaver2016-05-117-19/+15
|\ \ | |/
| * Merge pull request #2952 from phil-davis/hidemaskChris Buechler2016-05-112-2/+6
| |\
| | * Hide CIDR for alias types that do not use itPhil Davis2016-05-111-0/+4
| | | | | | | | | | | | | | | Suggested/discussed in forum https://forum.pfsense.org/index.php?topic=111593.0
| | * hideMask only modify input-group on first parentPhil Davis2016-05-111-2/+2
| | | | | | | | | | | | | | | Otherwise when unhiding (e.g. for Network type alias), input-group gets added to every div up the DM hierarchy and the layout gets messed up.
| * | Rename OSPF and System Patches packages in pre_upgrade_command. Ticket #6118Chris Buechler2016-05-111-1/+6
| | |
| * | Revert "Add config upgrade code to update package names. Ticket #6118"Chris Buechler2016-05-113-15/+2
| |/ | | | | | | This reverts commit 297ace668e4a4ffbf1fb1581e7c765e2ed158e29.
| * Check for is_array here to avoid possible issues if the config.cache is ↵Chris Buechler2016-05-101-1/+1
| | | | | | | | invalid. Adapted from PR 2925
OpenPOWER on IntegriCloud