Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3519 from phil-davis/patch-6 | Renato Botelho | 2017-02-09 | 1 | -1/+4 |
|\ | |||||
| * | Fix keylength.com href in system_usermanager | Phil Davis | 2017-02-09 | 1 | -1/+4 |
| | | | | | | | | | | The literal <a href=... text was displaying here, not an actual link to keylength.com While here, reformat to take the HTML out of the main setHelp string. Note: the literal text keylength.com has also been taken out of the main setHelp string, because it is literally the referenced site URL text, so it would not be appropriate for it to be translated. | ||||
* | | Merge pull request #3520 from phil-davis/sethelp-9 | Renato Botelho | 2017-02-09 | 11 | -66/+63 |
|\ \ | |||||
| * | | setHelp and gettext for system* | Phil Davis | 2017-02-09 | 11 | -66/+63 |
| |/ | |||||
* | | Merge pull request #3518 from phil-davis/patch-5 | Renato Botelho | 2017-02-09 | 1 | -5/+5 |
|\ \ | |||||
| * | | Fix system_gateways_edit setHelp sprintf warning | Phil Davis | 2017-02-09 | 1 | -5/+5 |
| |/ | | | | | | | The code at line 759 emitted a warning because of the bare '%' in the string. Other changes are to clarify and tidy up some other sprintf strings. | ||||
* | | Merge pull request #3516 from phil-davis/patch-4 | Renato Botelho | 2017-02-09 | 1 | -1/+1 |
|\ \ | |||||
| * | | status_upnp remove nested getext() | Phil Davis | 2017-02-09 | 1 | -1/+1 |
| |/ | | | | | I don't think this does anything useful. | ||||
* | | Merge pull request #3517 from phil-davis/sethelp-8 | Renato Botelho | 2017-02-09 | 7 | -31/+38 |
|\ \ | |||||
| * | | setHelp and getttext format for status* | Phil Davis | 2017-02-09 | 7 | -31/+38 |
| |/ | |||||
* | | Merge pull request #3513 from phil-davis/sethelp-7 | Renato Botelho | 2017-02-09 | 17 | -80/+81 |
|\ \ | |/ |/| | |||||
| * | services_dyndns_edit % needs to be escaped | Phil Davis | 2017-02-09 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into sethelp-7 | Phil Davis | 2017-02-08 | 4 | -5/+5 |
| |\ | |||||
| * | | setHelp strings for services* | Phil Davis | 2017-02-08 | 17 | -80/+81 |
| | | | |||||
* | | | Automatic GET to POST functions moved to pfSenseHelpers.js so they can be ↵ | Steve Beaver | 2017-02-08 | 2 | -78/+59 |
| | | | | | | | | | | | | used by any page | ||||
* | | | Improve comments | Steve Beaver | 2017-02-08 | 1 | -5/+5 |
| | | | |||||
* | | | Experimental method to convert GET calls to POST | Steve Beaver | 2017-02-08 | 1 | -10/+88 |
| |/ |/| | |||||
* | | Rever changes escaping '%' chars in help text. No longer required. | Steve Beaver | 2017-02-08 | 4 | -5/+5 |
|/ | |||||
* | Only use sprintf in setHelp() if more than one argument is received | Steve Beaver | 2017-02-08 | 2 | -2/+12 |
| | | | | This should eliminate all the issues caused by packages with embedded '%' in their text | ||||
* | Part fix #7233 keep correct staticmap_array_index | Phil Davis | 2017-02-08 | 1 | -4/+2 |
| | | | The index needs to be incremented even for entries that were skipped for display because they (for whatever reason) have no MAC or CID set. So use the key directly from the array. | ||||
* | Part Fix #7233 Allow deletion of empty static map entries | Phil Davis | 2017-02-08 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3486 from phil-davis/diag-backup | Renato Botelho | 2017-02-07 | 1 | -8/+8 |
|\ | |||||
| * | diag_backup do not use button text for comparisons | Phil Davis | 2017-02-06 | 1 | -8/+8 |
| | | |||||
* | | Rather than setting the value directly, minimize exposure to eval() in ↵ | jim-p | 2017-02-07 | 1 | -2/+5 |
| | | | | | | | | update_config_field() from wizard.php by constructing a variable reference, then set the value using the reference rather than passing user input through eval(). Fixes #7230 | ||||
* | | Convert easyrule.php to use a confirmation landing page so that the ↵ | jim-p | 2017-02-07 | 2 | -22/+67 |
| | | | | | | | | | | | | parameters can be submitted via POST. Also, remove the JavaScript confirmation box since it is now redundant. Fixes #7228 The confirmation page displays the submitted parameters for an extra user sanity check. Also fixed a bunch of page formatting issues that were not apparent because users rarely if ever saw output from the page. | ||||
* | | interfaces_ppps_edit remove embedded HTML from setHelp string | Phil Davis | 2017-02-07 | 1 | -2/+2 |
| | | | | | | There was only one of these remaining to do. | ||||
* | | Merge pull request #3501 from phil-davis/patch-1 | Renato Botelho | 2017-02-07 | 1 | -22/+27 |
|\ \ | |||||
| * | | interfaces_ppps_edit fixes that will work on 2.3.3 also | Phil Davis | 2017-02-07 | 1 | -22/+27 |
| | | | | | | | | | | | | | | | | | | | | | 1) Make "The MTU is too big" message actually come out. The code around line 300 was rubbish (maybe from before bootstrap?). 2) Show friendly description rather than 'wan' 'lan' opt1' in interface link list. 3) If any specific link parameters are set, then open the advanced section on page load. I tested on a 2.4 system, then applied these diff on a 2.3.3 system and it worked there also. So this should backport fine. | ||||
* | | | Merge pull request #3503 from phil-davis/patch-3 | Renato Botelho | 2017-02-07 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Fix #7226 Package installation message is incomplete | Phil Davis | 2017-02-07 | 1 | -0/+1 |
| | | | | | | | | | | | | This makes it remember pkgname after the install finishes and the form is re-submitted. | ||||
* | | | | Merge pull request #3502 from phil-davis/patch-2 | Renato Botelho | 2017-02-07 | 1 | -9/+11 |
|\ \ \ \ | |||||
| * | | | | pkg_mgr_install remove embedded HTML from result strings | Phil Davis | 2017-02-07 | 1 | -9/+11 |
| |/ / / | |||||
* | | | | Encode the contents of pkg_filter before output. Fixes #7227 | jim-p | 2017-02-07 | 1 | -1/+1 |
|/ / / | |||||
* | | | Encode 'from' and 'to' before output on pkg_mgr_install.php. Fixes #7225 | jim-p | 2017-02-07 | 1 | -1/+1 |
| | | | |||||
* | | | Update translation files | Renato Botelho | 2017-02-07 | 44 | -10124/+13353 |
| | | | |||||
* | | | Regenerate pot | Renato Botelho | 2017-02-07 | 1 | -348/+476 |
| | | | |||||
* | | | Merge pull request #3494 from lukehamburg/copy-duid-patch-2 | Renato Botelho | 2017-02-07 | 1 | -5/+36 |
|\ \ \ | |/ / |/| | | |||||
| * | | add Copy DUID convenience button | lukehamburg | 2017-02-06 | 1 | -5/+36 |
| | | | | | | | | | | | | | | | - adds `Copy DUID` convenience button/js - no page refresh or AJAX | ||||
* | | | Merge pull request #3484 from phil-davis/sethelp-empty | Renato Botelho | 2017-02-07 | 5 | -8/+19 |
|\ \ \ | |||||
| * | | | Do not pass empty string to gettext | Phil Davis | 2017-02-06 | 5 | -8/+19 |
| | |/ | |/| | |||||
* | | | Merge pull request #3500 from phil-davis/patch-5 | Renato Botelho | 2017-02-07 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | license.php getext formats and breadcrumbs | Phil Davis | 2017-02-07 | 1 | -3/+4 |
| | |/ | |/| | | | | | | | 1) I added a breadcrumb because the "?" "help on this page" icon does not display nicely without the breadcrumbs section. 2) Make various gettext() a bit nicer. | ||||
* | | | Merge pull request #3499 from phil-davis/sethelp-review4 | Renato Botelho | 2017-02-07 | 5 | -11/+11 |
|\ \ \ | |||||
| * | | | setHelp and getttext for i*.php files | Phil Davis | 2017-02-07 | 5 | -11/+11 |
| |/ / | |||||
* | | | Merge pull request #3497 from phil-davis/patch-3 | Renato Botelho | 2017-02-07 | 1 | -13/+13 |
|\ \ \ | |||||
| * | | | interfaces_bridge_edit setHelp and input_errors formatting | Phil Davis | 2017-02-07 | 1 | -13/+13 |
| |/ / | | | | | | | | | | | | | | | | This had enough things to be worth its own pull request. 1) Get embedded HTML out of setHelp etc strings. 2) Fix some array parameters to setHelp (these were causing warnings). 3) Make various input error messages display the friendly interface name, rather thn "wan", "lan", "opt1". | ||||
* | | | Merge pull request #3496 from phil-davis/patch-2 | Renato Botelho | 2017-02-07 | 1 | -45/+45 |
|\ \ \ | |||||
| * | | | setHelp formatting for interfaces.php | Phil Davis | 2017-02-07 | 1 | -45/+45 |
| |/ / | | | | | | | | | | | | | | | | There was a fair bit of it, so I have put this in its own pull request. 1) Gets HTML out of the strings that go for translation. 2) Line 3365 - the words here about "hexadecimal" now go in the text directly in the setHelp so the translators will get access to them. 3) Line 2213 - a couple of backslash that were attempts at escaping the next char were not actually needed, and were displaying literally in the GUI. | ||||
* | | | Merge pull request #3495 from phil-davis/fbegin-fend | Renato Botelho | 2017-02-07 | 2 | -4/+0 |
|\ \ \ | |||||
| * | | | fbegin.inc and fend.inc are no longer used | Phil Davis | 2017-02-06 | 2 | -4/+0 |
| |/ / |