Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3465 from phil-davis/system-widget-filter | Renato Botelho | 2017-02-06 | 1 | -4/+160 |
|\ | |||||
| * | System Information widget filter gettext() | Phil Davis | 2017-02-04 | 1 | -17/+17 |
| | | |||||
| * | System Information Widget Filter | Phil Davis | 2017-02-02 | 1 | -4/+160 |
| | | |||||
* | | Merge pull request #3480 from PiBa-NL/certmgr_20170206 | Renato Botelho | 2017-02-06 | 1 | -1/+8 |
|\ \ | |||||
| * | | certificatemanager, don't show information from previous certificate if no ↵ | PiBa-NL | 2017-02-06 | 1 | -1/+8 |
| | | | | | | | | | | | | cert or csr is present in the cert | ||||
* | | | Merge pull request #3485 from phil-davis/form-var-names | Renato Botelho | 2017-02-06 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Use unique var names in Input.class.php | Phil Davis | 2017-02-06 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #3482 from phil-davis/patch-4 | Renato Botelho | 2017-02-06 | 1 | -14/+0 |
|\ \ \ \ | |||||
| * | | | | Remove unused restore_ver from diag_backup | Phil Davis | 2017-02-06 | 1 | -14/+0 |
| |/ / / | | | | | | | | | I cannot see where this is used any more. The functionality seems to now be done in diag_confbak | ||||
* | | | | Merge pull request #3478 from phil-davis/sethelp-review2 | Renato Botelho | 2017-02-06 | 9 | -66/+108 |
|\ \ \ \ | |||||
| * | | | | setHelp and gettext changes for firewall* pages | Phil Davis | 2017-02-05 | 9 | -66/+108 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3477 from phil-davis/patch-2 | Renato Botelho | 2017-02-06 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Firewall Rules Edit translate Source and Destination | Phil Davis | 2017-02-05 | 1 | -2/+2 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These bits were not translating. Line 1406 could possibly be like: ``` $group = new Form_Group($name . ' ' . gettext('Port Range')); ``` But then that assumes that in every target language the translation of "Source" or "Destination" can be put in front of the translation of "Port Range". So I have given the translators both full phrases to do what they like with. | ||||
* | | | | Merge pull request #3476 from phil-davis/sethelp-review1 | Renato Botelho | 2017-02-06 | 7 | -37/+49 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Remove HTML from strings in diags files | Phil Davis | 2017-02-05 | 7 | -37/+49 |
| |/ / | |||||
* | | | Escape '%' in help text | Steve Beaver | 2017-02-05 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3469 from phil-davis/fw-nat-out-edit-other-subnet | Steve Beaver | 2017-02-04 | 1 | -10/+39 |
|\ \ | |||||
| * | | Fix firewall_nat_out_edit dependency on English | Phil Davis | 2017-02-04 | 1 | -10/+39 |
| | | | |||||
* | | | Merge pull request #3472 from phil-davis/patch-2 | Steve Beaver | 2017-02-04 | 1 | -10/+12 |
|\ \ \ | |||||
| * | | | system_advanced_admin remove href from setHelp strings | Phil Davis | 2017-02-04 | 1 | -10/+12 |
| | | | | | | | | | | | | | | | | | | | | I think that giving long strings that contain various HTML tags in-line through for translation is going to be error-prone. Actually we do not want the translators to accidentally also translate href like system_usermanager or accidentally miss out some quotes or brackets. It seems safer to substitute these in using %s formatting. This is an example of the sort of changes that could be made. | ||||
* | | | | Merge pull request #3474 from lukehamburg/lukehamburg-patch-1 | Steve Beaver | 2017-02-04 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Add a '.' to the help text for consistency | luckman212 | 2017-02-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #3471 from phil-davis/patch-1 | Steve Beaver | 2017-02-04 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | system_advanced_admin remove setHelp array | Phil Davis | 2017-02-04 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Fixed embedded '%' that was breaking setText. | Steve Beaver | 2017-02-04 | 1 | -6/+5 |
|/ / / | |||||
* | | | Several more fixes for setHelp to assist with translation | Steve Beaver | 2017-02-03 | 8 | -17/+21 |
| | | | |||||
* | | | Fix #7202 | Steve Beaver | 2017-02-03 | 2 | -6/+6 |
| | | | | | | | | | | | | Fix several sprintf errors by escaping '%'s and removing '[ ]' which had been use to pass arguments to setHelp as an array. | ||||
* | | | Remove \n from gettext strings | Renato Botelho | 2017-02-03 | 3 | -13/+13 |
| | | | |||||
* | | | Merge pull request #3463 from jskyboo/master | Renato Botelho | 2017-02-03 | 3 | -0/+42 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add to NTP GPS processing of PGRMF sentence | jskyboo | 2017-02-02 | 3 | -0/+42 |
| |/ | |||||
* | | Remove unneeded sprint and gettext in setHelp | Phil Davis | 2017-02-03 | 7 | -11/+11 |
| | | |||||
* | | Provide info on services_checkip.php about what the server must return, and ↵ | jim-p | 2017-02-02 | 1 | -3/+24 |
| | | | | | | | | provide two examples of server-side code to return the client address. Fixes #6374 | ||||
* | | Remove unneeded sprintf from setHelp calls | Steve Beaver | 2017-02-02 | 6 | -24/+24 |
| | | |||||
* | | COnvert the setHelp method(s) to accept conventioanl printf style argument ↵ | Steve Beaver | 2017-02-02 | 3 | -22/+21 |
|/ | | | | lists. e.g.: setHelp("%d interfaces have been detected", $numIfs); | ||||
* | Merge pull request #3462 from phil-davis/percent-s-www | Renato Botelho | 2017-02-01 | 29 | -80/+80 |
|\ | |||||
| * | Code with multiple %s in usr/local/www | Phil Davis | 2017-02-01 | 29 | -80/+80 |
| | | |||||
* | | Merge pull request #3461 from phil-davis/patch-3 | Renato Botelho | 2017-02-01 | 1 | -1/+1 |
|\ \ | |||||
| * | | diag_reseststate sourcetablehelp escape of double-quotes not needed | Phil Davis | 2017-02-01 | 1 | -1/+1 |
| |/ | | | | | The backslash escaping of the double-quotes here displays the backslashes literal on the GUI. Escaping is not needed in this single-quoted string. | ||||
* | | Merge pull request #3458 from phil-davis/ifname-nopkg | Renato Botelho | 2017-02-01 | 3 | -4/+22 |
|\ \ | |||||
| * | | Redmine #7173 Do not allow pkg_ for If, IfGroup, Alias | Phil Davis | 2017-02-01 | 3 | -4/+22 |
| |/ | |||||
* | | Fix #7183 Do not allow Interface Groups with the same name | Phil Davis | 2017-02-01 | 1 | -5/+3 |
|/ | | | I should stop trying bad stuff, there seem to be so many holes to find in the validation :) | ||||
* | Fixed #7180 | Steve Beaver | 2017-01-31 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3451 from phil-davis/required-fields-vpn | Renato Botelho | 2017-01-31 | 9 | -67/+72 |
|\ | |||||
| * | Required fields for VPN pages | Phil Davis | 2017-01-31 | 9 | -67/+72 |
| | | |||||
* | | Fix #7173 Interface Group Name cannot contain dash | Phil Davis | 2017-01-31 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #3449 from phil-davis/required-fields-system | Renato Botelho | 2017-01-30 | 16 | -88/+112 |
|\ | |||||
| * | Required fields for System pages | Phil Davis | 2017-01-30 | 16 | -88/+112 |
| | | |||||
* | | Fixed #7171 | Steve Beaver | 2017-01-30 | 3 | -8/+5 |
| | | | | | | | | Moved setHelpText() to helpers file | ||||
* | | Merge pull request #3448 from phil-davis/required-fields-services | Renato Botelho | 2017-01-30 | 20 | -47/+71 |
|\ \ | |/ |/| | |||||
| * | Required fields in Services pages | Phil Davis | 2017-01-30 | 20 | -47/+71 |
| | |