summaryrefslogtreecommitdiffstats
path: root/src/usr
Commit message (Collapse)AuthorAgeFilesLines
* fix logic and replace hard coded value by globalstilez2016-05-241-2/+2
| | | | backups should be a numeric int. text hint for number of backups can now refer to the global value for this platform (and explains how to get that default, by leaving blank)
* Give settings section a more helpful/standard title to match other GUI ↵stilez2016-05-241-2/+2
| | | | settings tabs
* Fix quoting in diag_routes.php, see ticket #6371jim-p2016-05-201-1/+1
|
* Better fix for escaping in ticket #6371jim-p2016-05-201-1/+1
|
* Revert "Status / Services - Status Indicator"Renato Botelho2016-05-201-1/+1
| | | | This reverts commit e7161dc3b62b306b57c8d094f93c2ec08c9e0af2.
* Merge pull request #2970 from NOYB/Status_/_Interfaces_-_DNS_ServersRenato Botelho2016-05-201-1/+1
|\
| * Status / Interfaces - DNS ServersNOYB2016-05-191-1/+1
| | | | | | | | The DNS servers are not necessarily ISP provided.
* | Merge pull request #2972 from NOYB/Status_/_Services_-_Status_IndicatorRenato Botelho2016-05-201-1/+1
|\ \
| * | Status / Services - Status IndicatorNOYB2016-05-201-1/+1
| | | | | | | | | | | | | | | Use font awesome icons instead of text. Universal recognition eliminates need of text translation.
* | | Merge pull request #2969 from marianamorim/add_function_gettextRenato Botelho2016-05-201-3/+3
|\ \ \
| * | | Add the function gettextmarianamorim2016-05-181-3/+3
| | |/ | |/|
* | | Merge pull request #2973 from jlduran/pass-block-icons-cpRenato Botelho2016-05-201-2/+2
|\ \ \
| * | | Fix Captive Portal's MACs iconsJose Luis Duran2016-05-201-2/+2
| | | | | | | | | | | | | | | | Standardize pass/block icons with the rest of the system
* | | | Fix closing `tbody` tag in Captive Portal's MACsJose Luis Duran2016-05-201-1/+1
|/ / /
* | | Fixed #6872 Restored missing proxy port settingStephen Beaver2016-05-201-0/+7
| |/ |/| | | | | (cherry picked from commit 6b43692408912de3375b34cc1982ff73f52762a5)
* | Fix up diag_smart e-mail handling, and the backend config code was ↵jim-p2016-05-191-21/+29
| | | | | | | | broken/making false assumption about the config file as well. Fixes #6371
* | Update pfSense.potRenato Botelho2016-05-191-6369/+6616
|/
* Merge pull request #2968 from NewEraCracker/patch-gettext-maxlenStephen Beaver2016-05-181-1/+1
|\
| * Reduce maximum length of string to gettext()NewEraCracker2016-05-171-1/+1
| | | | | | | | | | | | This limit is set at 4096 on PHP 5.6: http://lxr.php.net/xref/PHP_5_6/ext/gettext/gettext.c#139 Bug report on forum: https://forum.pfsense.org/index.php?topic=110088.0
* | Initialize output var in firewall_shaper_queuesPhil Davis2016-05-171-0/+1
|/ | | | To clear any previous use of the var elsewhere in included files. Forum: https://forum.pfsense.org/index.php?topic=111852.0
* 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 #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 misspellings.Chris Buechler2016-05-151-1/+1
| |/ |/|
* | 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 #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
| | | |
* | | | Fixed #6349Stephen Beaver2016-05-121-0/+1
| |/ / |/| | | | | | | | (cherry picked from commit c032a89a890a350540df12a9d2e41b9c7d8efda5)
* | | 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
|/ /
* | 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-113-3/+12
|\ \ | |/
| * 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
| |/
* | Merge pull request #2950 from ↵Stephen Beaver2016-05-111-2/+2
|\ \ | |/ |/| | | NOYB/Miscellaneous_Textual_Corrections_-_Services_Dynamic_DNS
OpenPOWER on IntegriCloud