Skip to content

Fix scrolling issue on mobile#47

Open
netdust wants to merge 17 commits intoStereobit:masterfrom
netdust:master
Open

Fix scrolling issue on mobile#47
netdust wants to merge 17 commits intoStereobit:masterfrom
netdust:master

Conversation

@netdust
Copy link

@netdust netdust commented Dec 26, 2014

fixed some scrolling issues on mobile and also added a simple plugin system.

@Stereobit
Copy link
Owner

Hey @netdust there are a lot changes in this pull request. I don't really understand why you removed all demos and what this .idea folder is?

@netdust
Copy link
Author

netdust commented Dec 28, 2014

Yes, that wasn't my best idea. I added all the files back to the repo. can
you check if you can merge?

On 26 Dec 2014 15:07, "Tobias Otte" notifications@github.com wrote:

Hey @netdust https://github.com/netdust there are a lot changes in this
pull request. I don't really understand why you removed all demos and what
this .idea folder is?


Reply to this email directly or view it on GitHub
#47 (comment).

@Stereobit
Copy link
Owner

There are still these strange .idea and Thumbs.db files. And there are merge conflicts so I can't merge right now.

Can you do me favour and split the changes on the script it self and the plugin things into different pull requests? This would be easier to review.

@netdust
Copy link
Author

netdust commented Dec 28, 2014

Okey. will do
On 28 Dec 2014 19:22, "Tobias Otte" notifications@github.com wrote:

There are still these strange .idea and Thumbs.db files. And there are
merge conflicts so I can't merge right now.

Can you do me favour and split the changes on the script it self and the
plugin things into different pull requests? This would be easier to review.


Reply to this email directly or view it on GitHub
#47 (comment).

@netdust
Copy link
Author

netdust commented Dec 29, 2014

okey, i am a bit lost here. I removed the .idea folder wich is a settings
folder from phpstorm.

Could you give me a step by step guide on how to get this done? I am new in
this and don't see how I can make 2 different pull requests
sorry for the hasle

2014-12-28 19:24 GMT+01:00 Stefan Vandermeulen stefan@netdust.be:

Okey. will do
On 28 Dec 2014 19:22, "Tobias Otte" notifications@github.com wrote:

There are still these strange .idea and Thumbs.db files. And there are
merge conflicts so I can't merge right now.

Can you do me favour and split the changes on the script it self and the
plugin things into different pull requests? This would be easier to review.


Reply to this email directly or view it on GitHub
#47 (comment).

Netdust[i]std.
Stefan Vandermeulen

you can follow me on twitter https://twitter.com/#!/netdust or
google+ https://plus.google.com/u/0/116430909251309245804/postsgsm:
+32(0)475 238 704

@Stereobit
Copy link
Owner

Hey @netdust, your commits are a bit messed up. I think the easiest solution would be to create a new branch based on the current master and just copt and paste your changes on the library and do a separate commit and pull request with it.

@hashworks
Copy link
Contributor

So I guess this can be closed since he opened #50?
EDIT: Easier fix is #62.

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