summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix indentRenato Botelho2016-01-221-2/+6
|
* Fixed #5797Stephen Beaver2016-01-221-11/+12
|
* Restore code from bad mergeStephen Beaver2016-01-222-1/+8
|
* Correct this function call. Fixes #5799jim-p2016-01-221-1/+1
|
* firewall_aliases add print_apply_box codePhil Davis2016-01-221-0/+1
|
* Fix #5794 remove print_info_box_np chackes for gettext("apply")Phil Davis2016-01-2249-121/+86
| | | | | | | | | | | | | | | | | | | | | | | | 1) Get rid of the stristr() checks to "guess" if an apply button should be used. 2) Change print_info_box() so it can take a button name of "close" , "apply" or none to decide which button to show. 3) Delete function print_info_box_np_undo() - nothing calls it. 4) Add new function print_apply_box() to provide an easy wrapper for print_info_box() with the parameters to be 'warning' level and 'apply' button. 5) Change print_info_box_np() calls to just print_info_box() or print_apply_box() as appropriate. There is 1 direct call to print_info_box_np() from vpn_ipsec_mobile.php remaining. That tries to make a "create" button. It was not working before this change. It needs to be sorted out and fixed separately. After this change there is no dependency on a string containing text like "apply" to make the apply button appear. Then we can work on re-engineering the internal code of print_info_box_np() print_info_box() and print_apply_box() to fit together however we like. It should be easy to preserving the current API to print_info_box() and print_apply_box().
* Only the serial enable/disable and primary console selectors should be ↵jim-p2016-01-221-9/+11
| | | | hidden for this test, the serial speed selector must still be available.
* Somehow missed this in the committed version.jim-p2016-01-221-1/+1
|
* Merge pull request #2513 from ch1c4um/replace_jQuery_to_$Renato Botelho2016-01-2218-149/+149
|\
| * Replaced jQuery to $ in same filesFrancisco Cavalcante2016-01-2218-149/+149
| |
* | Relocate subnet mask drop-down to a more sensible place on the PPPoE server, ↵jim-p2016-01-222-9/+26
| | | | | | | | add a user login count option.
* | Use default log file from pfSense-upgrade when it's called by GUI, this will ↵Renato Botelho2016-01-221-2/+2
| | | | | | | | make sure we preserve first part of upgrade after reboot
* | Merge pull request #2512 from phil-davis/patch-2Stephen Beaver2016-01-221-2/+7
|\ \
| * | Make diag_arp info an infoblockPhil Davis2016-01-221-2/+7
|/ / | | | | I might find a few of these while looking at various print_info_block calls, but this one for a start that works well as infoblock blockopen.
* | Merge pull request #2510 from brunostein/add_call_gettext_function_menu_vpnStephen Beaver2016-01-225-9/+9
|\ \ | |/ |/|
| * replaced jQuery to $bruno2016-01-221-2/+2
| |
| * add call 'gettext' function in the vpn menu filesbruno2016-01-225-7/+7
| |
* | Merge pull request #2509 from ch1c4um/replace_jQuery_to_$Stephen Beaver2016-01-220-0/+0
|\ \
| * | Replaced jQuery to $ in status_filter_reloadFrancisco Cavalcante2016-01-221-8/+8
| | |
* | | Make sure LANG = C for pkg callsRenato Botelho2016-01-222-0/+3
| | |
* | | Move set_language() call back to guiconfig.inc since it's causing trouble on ↵Renato Botelho2016-01-222-5/+5
| | | | | | | | | | | | console
* | | Remove attributions of return code not being used at allRenato Botelho2016-01-221-4/+4
| | |
* | | Follow FreeBSD steps (r294560) and stop creating rsa1 and dsa keys by defaultRenato Botelho2016-01-221-2/+0
| |/ |/|
* | Merge pull request #2502 from phil-davis/patch-6Renato Botelho2016-01-221-1/+4
|\ \
| * | Be more flexible on detecting the need for the Apply buttonPhil Davis2016-01-221-1/+4
| | | | | | | | | This is the quick fix part (1) for https://redmine.pfsense.org/issues/5794
* | | Replace "jQuery" with "$" for consistencyStephen Beaver2016-01-221-8/+8
| |/ |/|
* | Merge pull request #2508 from brunostein/add_call_gettext_functionStephen Beaver2016-01-2218-80/+74
|\ \
| * | add call 'gettext' function in the status menu filesbruno2016-01-2218-80/+74
|/ /
* | Fixed #5793Stephen Beaver2016-01-221-3/+3
| |
* | Remove redundant alias check and move group check to proper place, fixes #5795Renato Botelho2016-01-221-16/+9
| |
* | Do not let interface description to have same name of an interface group. ↵Renato Botelho2016-01-221-0/+8
| | | | | | | | Fixes #5795
* | Merge pull request #2503 from NOYB/Form_Group_-_Empty_Title_GetTextRenato Botelho2016-01-221-1/+3
|\ \
| * | Adding {} to if statement.NOYB2016-01-221-1/+2
| | |
| * | Form Group - Empty Title GetTextNOYB2016-01-221-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't call gettext with an empty title. There are undoubtedly other places that a check should be done before passing a variable only to a gettext call. Fixes use case of form group class without a title from passing empty var to gettext. Gettext returns header info. when an empty string/var is passed. Perhaps a function should be created for this for consistency. http://php.net/manual/en/function.gettext.php#108594 For groups without a title gettext returns header info. To reproduce the issue select a non English language and open any of the following: Services Load Balancer - edit Diagnostics - Backup/Restore Diagnostics - Status SMART Status - System Logs - log filter and manage log panels (not a comprehensive list)
* | Merge pull request #2494 from phil-davis/patch-2Renato Botelho2016-01-221-6/+7
|\ \
| * | xmlrpc signature and docstringPhil Davis2016-01-211-6/+7
| | | | | | | | | A few of the entries in this array had dodgy var references. I don't think anything would have caused an actual error.
* | | Merge pull request #2500 from NOYB/Firewall_Log_Widget_-_Revert_AbbreviationRenato Botelho2016-01-221-2/+2
|\ \ \
| * | | Firewall Log Widget - Revert AbbreviationNOYB2016-01-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fine to spell out 'Destination' here. 1) Field content already has column wide enough. 2) Consistent with firewall log. 3) Already translated. Return interface abbreviation to it's original uppercase 'IF' to not look so much like the word 'If'.
* | | | Merge pull request #2505 from phil-davis/patch-5Renato Botelho2016-01-221-2/+2
|\ \ \ \
| * | | | Cleanup crash_reporter Submit checksPhil Davis2016-01-221-2/+2
| | |_|/ | |/| | | | | | | | | | When looking at this earlier I never paid attention to the left side of each of these conditions. It is pretty dumb to gettext($_POST['Submit']) and then compare it to gettext("Yes") !!! This cleans it up so it does just an ordinary comparison - works fine.
* | | | Merge pull request #2504 from phil-davis/gettext-widgetsRenato Botelho2016-01-2236-147/+154
|\ \ \ \ | |/ / / |/| | |
| * | | Internationalize dashboard widgetsPhil Davis2016-01-2236-147/+154
| | | |
* | | | Merge pull request #2501 from phil-davis/patch-5Chris Buechler2016-01-221-2/+2
|\ \ \ \
| * | | | Crash Reporter compare choice with language-specific string #5792Phil Davis2016-01-221-2/+2
| |/ / / | | | | | | | | | | | | | | | | I don't really understand why this has to be - the HTML has value="Yes" and value="No" - I thought those would be the strings sent along with "submit". The translation of Yes and No should have been just for display purposes. But after this change, I can submit or delete crash reports when the UI isin other languages.
* | | | Don't show RTT, RTTsd, Loss for unmonitored gatewaysChris Buechler2016-01-221-3/+9
| | | |
* | | | Merge pull request #2470 from al-right/masterChris Buechler2016-01-211-9/+57
|\ \ \ \ | |/ / / |/| | |
| * | | Bugfixes & handling $duid and $type, Fixes #4206Anders Lind2016-01-181-9/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch addresses: 1. Handling of IA_NA and IA_PD strings (that contain IAID+DUID content) using only the DUID part. 2. Fixing regular expression matching with respect to the IAID+DUID string regarding the legal \" substring (used in ISC DHCPv6 leases). 3. Checking the $duid variable before use. Default case for $type in the switch case statement. Please see the ticket for further information.
* | | | Added some commentsStephen Beaver2016-01-211-0/+3
| |/ / |/| |
* | | Merge pull request #2498 from NewEraCracker/masterStephen Beaver2016-01-212-2/+2
|\ \ \
| * | | Fix another misplaced quoteNewEraCracker2016-01-211-1/+1
| | | |
OpenPOWER on IntegriCloud