Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Fix for issue #5631 #5714
Ok, I've reverted the changes regarding hovercard positioning and used a different approach now to solve the flickering issue.
I've modified the
Awesome this works great. Please just make sure to resolve the above comments and squash your commits into one:
git remote add upstream git://github.com/diaspora/diaspora.git git fetch upstream git checkout 5631-broken-people-preview git rebase -i upstream/develop # Choose pick for the first line, squash for the other ones, save & quit git push -f origin 5631-broken-people-preview
As a tip for the future: You can edit a commit with