Feature/multiproxy api keys #1896
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
added 8 commits
November 8, 2016 10:36
|
please review for functionality, if it works as suspected, I add i18n strings for errors etc. small things. Creating another issue/PR for updating "api_umbrella.js" functions for multiproxy support (ie. use proxyId) Should be merged as closely together to keep existing things function, imho. |
|
@jykae please resolve conflicts. |
|
@brylie yep, thx for merging groundwork that fast! |
added 2 commits
November 9, 2016 10:35
|
@brylie conflicts solved |
|
I add i18n etc. & clean unnecessary console.logs. |
|
OK, let me know when it is ready. |
|
@brylie ready |
brylie
reviewed
Nov 9, 2016
| "apinf_usernotloggedin_error": "Could not find signed-in user.", | ||
| "apinf_apiumbrellauser_error": "Error: Could not create user on proxy", | ||
| "apinf_noproxy_error": "Error: No proxy found", | ||
| "apinf_noproxybackend_error": "Error: No proxyBackend found", |
There was a problem hiding this comment.
This should be something like "No proxy backend found."
There was a problem hiding this comment.
changing it tomorrow :)
|
@brylie Will you review this? I.e. should the PR be assigned to you? |
|
@brylie Fixed. Anything else? |
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.
Closes #1874