search

Stereobit / dragend

dragend JS – a touch ready, full responsive, content swipe script
http://stereobit.github.com/dragend/
MIT License
485 stars 114 forks source link

Fix scrolling issue on mobile #47

Open netdust opened 9 years ago

netdust commented 9 years ago

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

Stereobit commented 9 years ago

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 commented 9 years ago

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 https://github.com/Stereobit/dragend/pull/47#issuecomment-68142319.

Stereobit commented 9 years ago

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 commented 9 years ago

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 https://github.com/Stereobit/dragend/pull/47#issuecomment-68214758.

netdust commented 9 years ago

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 https://github.com/Stereobit/dragend/pull/47#issuecomment-68214758.

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 commented 9 years ago

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 commented 9 years ago

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