Skip to content

refactored 'settings' to 'advanced' in Pop Up Dialog#127

Merged
kezhenxu94 merged 2 commits intowuseal:masterfrom
SuuSoJeat:master
Mar 30, 2019
Merged

refactored 'settings' to 'advanced' in Pop Up Dialog#127
kezhenxu94 merged 2 commits intowuseal:masterfrom
SuuSoJeat:master

Conversation

@SuuSoJeat
Copy link
Copy Markdown
Contributor

@SuuSoJeat SuuSoJeat commented Mar 29, 2019 •
edited by kezhenxu94
Loading

Resolve #125 refactored 'settings' to 'advanced' in Pop Up Dialog

@wuseal
Copy link
Copy Markdown
Owner

wuseal commented Mar 30, 2019 •
edited
Loading

Glad to receive your PR, Now we need to merge your Pull Request into branch 3.2.0, So Please rebase the merge target branch to wuseal:3.2.0 😄 , And It will be published in next version: 3.2.0

wuseal
wuseal requested changes Mar 30, 2019
View reviewed changes
Copy link
Copy Markdown
Owner

@wuseal wuseal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need rebase target branch from master to 3.2.0

@kezhenxu94 kezhenxu94 changed the base branch from master to 3.2.0 March 30, 2019 00:29
@kezhenxu94
Copy link
Copy Markdown
Collaborator

kezhenxu94 commented Mar 30, 2019

Need rebase target branch from master to 3.2.0

Actually we can do this on this web page for the contributor (Click edit and change the base branch), but there are conflicts, could you @SuuSoJeat please resolve the conflict? I think we can help to resolve if the contributor need help @wuseal

@kezhenxu94 kezhenxu94 requested a review from wuseal March 30, 2019 00:35
@kezhenxu94 kezhenxu94 added this to the 3.2.0 milestone Mar 30, 2019
@wuseal
Copy link
Copy Markdown
Owner

wuseal commented Mar 30, 2019

@kezhenxu94 Yes！of course!

@wuseal
Copy link
Copy Markdown
Owner

wuseal commented Mar 30, 2019

Let's merge it into master branch first, And then merge master into branch 3.2.0, And all pull request from new contributors could do like this

@wuseal wuseal changed the base branch from 3.2.0 to master March 30, 2019 10:12
@kezhenxu94 kezhenxu94 merged commit df12f03 into wuseal:master Mar 30, 2019
@kezhenxu94
Copy link
Copy Markdown
Collaborator

kezhenxu94 commented Mar 30, 2019

@SuuSoJeat Thanks for your contributions!

@SuuSoJeat
Copy link
Copy Markdown
Contributor Author

SuuSoJeat commented Mar 31, 2019

Oops! Sorry guys! I was caught up in something. Guess, I'm late.

wuseal pushed a commit that referenced this pull request Sep 20, 2021
@kezhenxu94
Rename 'settings' to 'advanced' in Pop Up Dialog (#127)
f9fc010
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wuseal wuseal wuseal approved these changes

Assignees

No one assigned

Labels

enhancement

Projects

None yet

Milestone

3.2.0

Development

Successfully merging this pull request may close these issues.

3 participants

@SuuSoJeat @wuseal @kezhenxu94
⚡