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.

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

log out of converse when logging out of roundcube #2

Merged
merged 2 commits into from
Oct 21, 2017

Conversation

HanakoSeishin
Copy link
Contributor

No description provided.

// log out of converse when logging out of roundcube
rcmail.addEventListener('beforeswitch-task', function(e){
if(e == 'logout'){
//console.log('logout');
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could you please remove this comment?

@devurandom
Copy link
Collaborator

Thanks! Can you please squash the two commits into one?

@HanakoSeishin
Copy link
Contributor Author

Sorry, now idea how to do so. I'm totally new here and the whole interface is still confusing and overwhelming.

@devurandom
Copy link
Collaborator

devurandom commented Oct 21, 2017

The first result of the web search I did explains quite well how to do it: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

Ignore the warning about not doing this to pushed commits -- in this case this is actually what you want to do. When pushing the squashed commit, you will have to force-push it using git push --force, though.

@HanakoSeishin
Copy link
Contributor Author

I'm terribly sorry, but explaining quite well how make a barrel roll doesn't help if one doesn't know how to take off in the first place. I was under impression that the purpose of this site, well at least part of it, is making it easy for people to contribute. But I guess I was wrong. Maybe I'll come back some day when I can get what that article is even talking about.

@devurandom
Copy link
Collaborator

You're right, the site is quite more advanced by now, than I realised. I can squash the commits for you from the web-interface.

@devurandom devurandom merged commit c5e5674 into conversejs:master Oct 21, 2017
devurandom pushed a commit that referenced this pull request Oct 21, 2017
@devurandom
Copy link
Collaborator

For whatever reason this did not go well, so I manually edited the history. Should be fine now.

Thanks for the contribution!

@mckaygerhard
Copy link

solution for to #10 and #5 thanks

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.

3 participants