This repository has been archived by the owner on May 6, 2020. It is now read-only.
Update 1.4 branch with latest commits #156
Open
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
- Bump to 1.3.0
- Bump to 1.3.0
- respect `evaluate` argument - add `addQuotes` argument - set property to bypass proxy
- add as experiment property - fix Proxy
- Demonstrates inline javascript
… responses - related to shyras#128 and shyras#132
- closes shyras#135
- closes shyras#135
|
Nope, I definitely merge against 1.4 now, and before I open the pull request it says these branches can be automatically merged, but after opening it, it mentions these conflicts. I'll see if I can quickly resolve the conflicts. |
|
I tried a rebase or merge operation with my 1.4 branch into shyras/1.4 locally and experienced no conflicts whatsoever. Osweb also runs normally. I don't know why the merge operation on Github causes conflicts. |
|
Don't worry, I'll take a look at it. |
- Fixes shyras#139 - Also add to unit test
- Now takes scaling and offset into account
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Continuing the attempt started at #155