Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Change Profile tips #1121

Closed
davehakkens opened this issue Mar 31, 2021 · 3 comments · Fixed by #1131
Closed

Change Profile tips #1121

davehakkens opened this issue Mar 31, 2021 · 3 comments · Fixed by #1131
Assignees
@tudi2d
Labels
Frontend Good first issue Help wanted

Comments

@davehakkens
Copy link
Contributor

davehakkens commented Mar 31, 2021 •
edited
Loading

Component infos

Description

We need to update our profile tips in the profile settings.
⭐️ Part of our new verification program #1123

Page related

Will be used in : https://community.preciousplastic.com/settings

Mockup (original text)

afbeelding

New text:

Profile Tips

  1. Have a look at our Profile Guidelines.
  2. Choose your focus.
  3. If you want to get a pin on the map check our Community Program
  4. Add a nice description, pics and details.
  5. If something doesn’t work, contact us.
@tudi2d
Copy link
Member

tudi2d commented Apr 14, 2021

Will work on this one! :)

@tudi2d tudi2d self-assigned this Apr 14, 2021
davehakkens added a commit that referenced this issue Apr 23, 2021
@davehakkens
Change Profile Tips
5cf4906 
According to issue #1121
@davehakkens davehakkens mentioned this issue Apr 23, 2021
Merged
6 tasks
@davehakkens
Copy link
Contributor Author

hi @tudi2d, planning to work on a release this morning and want to add this. So I took it over this one.
Also left a comment in the pull request, perhaps you can help out?
#1131

@tudi2d
Copy link
Member

tudi2d commented Apr 26, 2021 •
edited
Loading

Hi @davehakkens - sorry, been of GitHub for a few days - will take a look at the PR later :)

chrismclarke added a commit that referenced this issue Apr 26, 2021
@chrismclarke
Merge pull request #1131 from ONEARMY/text-edits
8067937 
> I made 2 different branches
> 
> 1. dave-edits to close #1122
> 2. text-edits to close #1121
> 
> Is this the correct way to do it, create a branch for each new edit.
> And it looks like the text-edit branch contains all edits now (also from dave-edits)?

So it depends how you go about creating the branches. If you're on the master branch when you create a new branch then that will be based from master. If you make some changes and then create another new branch, that will continue from the changes you made. 

So if you want two fully independent branches you need to go back to master each time before creating a new branch - but no harm if you want to address a couple issues in the same pull request (or you can also just mention in the pull request that it continues from another pr which should be merged first)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@tudi2d tudi2d

Labels
Frontend Good first issue Help wanted
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

#1121 Change Profile tips ONEARMY/community-platform
3 participants
@tudi2d @chrismclarke @davehakkens