Skip to content

Ticket phpbb3 15109#4779

Closed
YasaraPeiris wants to merge 3 commits intophpbb:3.2.xfrom
YasaraPeiris:ticket/PHPBB3-15109
Closed

Ticket phpbb3 15109#4779
YasaraPeiris wants to merge 3 commits intophpbb:3.2.xfrom
YasaraPeiris:ticket/PHPBB3-15109

Conversation

@YasaraPeiris
Copy link
Copy Markdown

@YasaraPeiris YasaraPeiris commented Mar 28, 2017

Added a dropdown to place all smilies Sain full screen editor in area51, community & other places where a user can post a reply to save some screen space..

Could not automatically create an issue. Please create one on https://tracker.phpbb.com/ and replace this text with a link to it.

…s in a dropdown box in full screen editor.

In here I have added a smiley dropdown to editor to save screen space.
Here I have mainly modified posting_editor.html file to remove side
smiley box container. Then I have added a new file called
smiley_dropdown.html to display a smiley dropdown.This file is included
to posting_editor.html file. After that I did necessary modifications to
styles in colour.css, common.css and forms.css. All the modifications
are commented in the necessary locations.
@hanakin
Copy link
Copy Markdown
Member

hanakin commented Mar 28, 2017

this needs to be applied to master not 3.2.x

this will need rebased on the master branch

also you need to use the proper guidelines for creating commits and prs https://area51.phpbb.com/docs/dev/31x/development/git.html

the default pr template should have been provided for you when you created the pr

@YasaraPeiris
Copy link
Copy Markdown
Author

YasaraPeiris commented Mar 28, 2017 via email

@hanakin
Copy link
Copy Markdown
Member

hanakin commented Mar 28, 2017

  1. I would first do a git reset as you need to fix your commit msgs since they do not follow the proper format outlined in the link i provided.
  2. Then stash everything and checkout create a new branch from master
  3. Apply the stash from before to the new branch
  4. create the proper commit msg
  5. force push to origin ticket/...
  6. fix the pr title and msg to match the linked format.

This PR was just merge so you can use it as an example

@YasaraPeiris
Copy link
Copy Markdown
Author

YasaraPeiris commented Mar 28, 2017

Thank you very much for your support. I'll work on that. But I have already added that to master. Sorry for the not correct format in the pr title. Can you do a git reset. Sorry for bothering you.

@hanakin
Copy link
Copy Markdown
Member

hanakin commented Mar 29, 2017

not sure what you mean git reset is something you need to do on your local branch... Are you familiar with git? If not I would suggest asking for help with this on ICQ channel #phpbb-dev, someone on there should be able to assist.

https://www.atlassian.com/git/tutorials/undoing-changes

…l smilies in a dropdown box in full screen editor."

This reverts commit b193114.
@hanakin
Copy link
Copy Markdown
Member

hanakin commented Mar 29, 2017

thats not going to fix anything...never perform anything that requires a new commit except for changes to the code that you make ie reverts/merges these should never require a commit, if it does then there is a better way to handle it.

@YasaraPeiris
Copy link
Copy Markdown
Author

YasaraPeiris commented Mar 29, 2017 via email

@hanakin
Copy link
Copy Markdown
Member

hanakin commented Mar 30, 2017

Pls close this as its a duplicate! #4783

@hanakin hanakin mentioned this pull request Apr 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants