New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: URL option for Data fieldtype (backport #12898) #13138
Closed
mergify
wants to merge
21
commits into
version-13-pre-release
from
mergify/bp/version-13-pre-release/pr-12898
Closed
feat: URL option for Data fieldtype (backport #12898) #13138
mergify
wants to merge
21
commits into
version-13-pre-release
from
mergify/bp/version-13-pre-release/pr-12898
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
(cherry picked from commit 82b9833)
(cherry picked from commit ce2dabe)
(cherry picked from commit 4d91f31)
(cherry picked from commit ea38895)
(cherry picked from commit f2079f6)
(cherry picked from commit f2e6478)
- Use utility function instead (cherry picked from commit 94c7541)
(cherry picked from commit af95a24)
- Also, remove one depracated $ method (cherry picked from commit 794308c)
(cherry picked from commit 472b21c)
(cherry picked from commit 6975e89)
(cherry picked from commit 0ab4f68)
(cherry picked from commit ddc4dc8)
(cherry picked from commit ee2e4e2)
(cherry picked from commit 81047bb)
(cherry picked from commit 9d4ee23) # Conflicts: # frappe/event_streaming/doctype/event_producer/event_producer.py
(cherry picked from commit b965ceb)
(cherry picked from commit 3e229e9)
(cherry picked from commit 024e759) # Conflicts: # frappe/event_streaming/doctype/event_producer/event_producer.py # frappe/oauth.py
(cherry picked from commit f4e4fc9) # Conflicts: # frappe/event_streaming/doctype/event_producer/event_producer.py
(cherry picked from commit 098b68f)
@NagariaHussain , Can you please resolve the merge conflicts and re-open if this need to be back ported. |
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.
This is an automatic backport of pull request #12898 done by Mergify.
Cherry-pick of 9d4ee23 has failed:
Cherry-pick of 024e759 has failed:
Cherry-pick of f4e4fc9 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refresh
will re-evaluate the rules@Mergifyio rebase
will rebase this PR on its base branch@Mergifyio update
will merge the base branch into this PR@Mergifyio backport <destination>
will backport this PR on<destination>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/