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

Update master #783

Merged
merged 63 commits into from
Nov 4, 2014
Merged

Update master #783

merged 63 commits into from
Nov 4, 2014

Conversation

aogilvie
Copy link
Collaborator

@aogilvie aogilvie commented Nov 4, 2014

No description provided.

levsa and others added 30 commits June 15, 2014 21:20
IOS - Extract permissions from session object instead of retrieving them with api call
Upgrade to Facebook Android SDK 3.18.1
Fix linter errors and do some code clean up
… and fix possible error in user facing error messages
Gradle build file fixes
Revert "Gradle build file fixes"
…k-plugin into better-error-handling

Conflicts:
	platforms/android/src/org/apache/cordova/facebook/ConnectPlugin.java
I've caused a regression to "Use href param instead of link for share dialog " with Pull Request #684

This commit fixes the regression while keeping the native Share Dialog
I've caused a regression to "Use href param instead of link for share dialog " with Pull Request #684

This commit fixes the regression while keeping the native Share Dialog
aogilvie and others added 26 commits October 14, 2014 13:05
update Cordova in ios sample project
Added new readme for PhoneGap build users
use NSNotificationCenter for handling URL
Update README.md text regarding broken symlinks in FacebookSDK.framework
…into develop

Conflicts:
	platforms/ios/README.md
	plugin.xml
aogilvie added a commit that referenced this pull request Nov 4, 2014
@aogilvie aogilvie merged commit a5c6be9 into master Nov 4, 2014
@matiassingers
Copy link
Collaborator

🎉

@aogilvie
Copy link
Collaborator Author

aogilvie commented Nov 4, 2014

🌴

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.

None yet

6 participants