Skip to content

JOpenstreetmap Package #1786

Merged
merged 11 commits into from Mar 18, 2013

5 participants

@Buddhima
Buddhima commented Jan 4, 2013

This package helps Joomla platform users to interact with Open Street Map API and exchange data easily. Information flow process is done through mostly OAuth authentication and some times Basic authentication.
So far, I have made few commits to make it error free code.
http://developer.joomla.org/pulls/pulls/1786.html

Happy to hear your opinions on this implementation.

Thanks !

This was referenced Jan 4, 2013
@eddieajau

@Buddhima this branch needs to be updated. If you can do that soon, I'll merge it. Thanks in advance.

@Buddhima

@eddieajau I have updated the branch. Thanks a lot for informing.

@dongilbert

There's still an issue with this. I think it's because we have already merged the oauth code into the repo, and it might be conflicting. Can you try pulling from staging back into your branch to resolve any merge conflicts? And then you can push an update to this, and we can merge. If you have some trouble, I'll try to make some time to help you out with the conflicts.

@Buddhima

Hi @dongilbert , I added OAuth1 code in order to pass the tests.
Can you please tell me how to pull from staging back into my JOsm branch?
Thanks!

@elinw
elinw commented Mar 18, 2013

@Buddhima try doing a rebase over the current staging branch and see what if any conflicts you get. I think they should be limited to just that one area of your code that uses the OAuth. Then deal with the conflicts individually. Then just check that everything still works.

@Buddhima

Hi @elinw , @eddieajau and @dongilbert , I solved conflicts (conflicts only found in Oauth1).
Thanks for guidance.

@dongilbert dongilbert merged commit 38ce0f0 into joomla:staging Mar 18, 2013
@mbabker mbabker referenced this pull request in joomla/joomla-framework Dec 2, 2013
Closed

Port API packages from CMS #297

1 of 4 tasks complete
@mbabker mbabker added a commit to joomla-framework/openstreetmap-api that referenced this pull request May 21, 2014
@Buddhima Buddhima Add documentation from joomla/joomla-platform#1786 17c4aea
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.