Synchronize official source code #78
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* add new tld option Signed-off-by: Dirk Brenken <[email protected]> (cherry picked from commit cb767dc)
Signed-off-by: Paul Donald <[email protected]> (cherry picked from commit bbc4a90)
If UCI store values as a list instead of an option, conversation for the collectd configuration is not work correctly. This is due to the use of a DynamicList type element in the UI (for example, for the RRATimespans field). For this function argument val receives as array instead of a string, so no additional conversion is required. Signed-off-by: Aleksey Kolosov <[email protected]>
Signed-off-by: Paul Donald <[email protected]> (cherry picked from commit 63b7e63)
With this change if the specified config file (from UCI) doesn't exist, it won't error out. instead it treats it as an empty file. Previously, when clicking edit on the custom_config option in the UI, it will show an error because the file doesn't exist there by default. As a result, a user can't easily add (paste) a config file content. Signed-off-by: Milad Mohtashamirad <[email protected]> (cherry picked from commit a30ae19)
As the app is now javascript-based, depend on luci-base instead of luci-compat. (modified from 3e7fe9f and 019e29f) Signed-off-by: Hannu Nyman <[email protected]>
Backport translations from master. Sync. Signed-off-by: Hannu Nyman <[email protected]>
If a non-EFI image comes first in the list of images, it would have been selected even on an EFI system. Signed-off-by: Jakob Haufe <[email protected]> (cherry picked from commit cb45737)
Closes openwrt#7449 Signed-off-by: Paul Donald <[email protected]> (cherry picked from commit 1ee9d0c)
Closes openwrt#7449 Signed-off-by: Paul Donald <[email protected]> (cherry picked from commit e76155d)
This commit fixes incorrect peer detection when using IP v6 by deleting all the square the square brackets from the wgHost variable. Signed-off-by: Tom Haley <[email protected]> (cherry picked from commit 5c97a89)
shellquote method is introduced so an injected code cannot be executed by the popen command. Signed-off-by: Tom Haley <[email protected]> (cherry picked from commit 101ea16)
Fixed incorrect peer detection if port is not set (default port is used) Signed-off-by: Tom Haley <[email protected]> (cherry picked from commit 27ecfda)
…ault port Fixed incorrect peer detection if IP v6 is used and no port for peer is defined. Signed-off-by: Tom Haley <[email protected]> (cherry picked from commit 461d632)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.