Skip to content
Commits on Jul 29, 2014
  1. Merge branch 'facebook-sdk-master'

    Conflicts:
    	samples/Configurations/Project.xcconfig
    	samples/FriendPickerSample/FriendPickerSample.xcodeproj/project.pbxproj
    	samples/FriendPickerSample/FriendPickerSample/FPViewController.m
    	samples/FriendPickerSample/ReadMe.txt
    	samples/HelloFacebookSample/HelloFacebookSample.xcodeproj/project.pbxproj
    	samples/HelloFacebookSample/HelloFacebookSample/HFViewController.m
    	samples/PlacePickerSample/PlacePickerSample.xcodeproj/project.pbxproj
    	samples/RPSSample/RPSSample.xcodeproj/project.pbxproj
    	samples/RPSSample/RPSSample/RPSAppDelegate.m
    	samples/RPSSample/RPSSample/RPSGameViewController.m
    	samples/Scrumptious/ReadMe.txt
    	samples/Scrumptious/Scrumptious.xcodeproj/project.pbxproj
    	samples/Scrumptious/scrumptious/SCAppDelegate.h
    	samples/Scrumptious/scrumptious/SCAppDelegate.m
    	samples/Scrumptious/scrumptious/SCLoginViewController.h
    	samples/Scrumptious/scrumptious/SCLoginViewController.m
    	samples/Scrumptious/scrumptious/SCMealPicker.h
    	samples/Scrumptious/scrumptious/SCProfilePictureButton.h
    	samples/Scrumptious/scrumptious/SCProtocols.h
    	samples/Scrumptious/scrumptious/scrumptious-Info.plist
    	samples/SwitchUserSample/SwitchUserSample.xcodeproj/project.pbxproj
    	samples/SwitchUserSample/SwitchUserSample/SUUserManager.m
    	samples/SwitchUserSample/SwitchUserSample/SUUsingViewController.m
    	src/Core/FBDataDiskCache.m
    	src/FBSDKMacros.h
    	src/FBSessionLoginStrategy.h
    	src/FacebookSDKApplicationTests/en.lproj/InfoPlist.strings
    	src/FacebookSDKTestHost/AppDelegate.h
    	src/FacebookSDKTestHost/FacebookSDKTestHost-Info.plist
    	src/FacebookSDKTestHost/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png
    	src/FacebookSDKTestHost/en.lproj/InfoPlist.strings
    	src/FacebookSDKTestHost/main.m
    	src/Network/FBRequestConnection.m
    	src/UI/FBLikeButton.h
    	src/UI/FBViewImpressionTracker.h
    Jérôme Lebel committed Jul 29, 2014
Commits on Jul 23, 2014
  1. @toddkrabach
Commits on Jul 17, 2014
  1. @chrisp-fb
Commits on Jul 10, 2014
  1. @gcaglar
Commits on Jun 25, 2014
  1. @chrisp-fb
Commits on Jun 13, 2014
  1. @toddkrabach
Commits on May 13, 2014
  1. @chrisp-fb
Commits on Apr 30, 2014
  1. @chrisp-fb
Commits on Apr 5, 2014
  1. @chrisp-fb
Commits on Mar 24, 2014
  1. still useless

    Jérôme Lebel committed Mar 24, 2014
  2. better

    Jérôme Lebel committed Mar 24, 2014
  3. Merge branch 'facebook-sdk-master'

    Conflicts:
    	samples/FriendPickerSample/FriendPickerSample.xcodeproj/project.pbxproj
    	samples/FriendPickerSample/FriendPickerSample/FPAppDelegate.m
    	samples/FriendPickerSample/FriendPickerSample/FPViewController.m
    	samples/GraphApiSample/GraphApiSample.xcodeproj/project.pbxproj
    	samples/GraphApiSample/GraphApiSample/GraphApiAppDelegate.m
    	samples/GraphApiSample/GraphApiSample/GraphApiViewController.m
    	samples/HelloFacebookSample/HelloFacebookSample.xcodeproj/project.pbxproj
    	samples/HelloFacebookSample/HelloFacebookSample/HFAppDelegate.m
    	samples/HelloFacebookSample/HelloFacebookSample/HFViewController.m
    	samples/PlacePickerSample/PlacePickerSample.xcodeproj/project.pbxproj
    	samples/PlacePickerSample/PlacePickerSample/PPAppDelegate.m
    	samples/PlacePickerSample/PlacePickerSample/PPViewController.m
    	samples/ProfilePictureSample/ProfilePictureSample.xcodeproj/project.pbxproj
    	samples/ProfilePictureSample/ProfilePictureSample/PPAppDelegate.m
    	samples/ProfilePictureSample/ProfilePictureSample/PPViewController.m
    	samples/RPSSample/RPSSample.xcodeproj/project.pbxproj
    	samples/RPSSample/RPSSample/OGProtocols.h
    	samples/RPSSample/RPSSample/RPSAppDelegate.m
    	samples/RPSSample/RPSSample/RPSFriendsViewController.m
    	samples/RPSSample/RPSSample/RPSGameViewController.m
    	samples/RPSSample/RPSSample/en.lproj/RPSGameViewController_iPhone.xib
    	samples/Scrumptious/Scrumptious.xcodeproj/project.pbxproj
    	samples/Scrumptious/scrumptious/SCAppDelegate.h
    	samples/Scrumptious/scrumptious/SCAppDelegate.m
    	samples/Scrumptious/scrumptious/SCLoginViewController.m
    	samples/Scrumptious/scrumptious/SCPhotoViewController.h
    	samples/Scrumptious/scrumptious/SCPhotoViewController.m
    	samples/Scrumptious/scrumptious/SCViewController.m
    	samples/Scrumptious/scrumptious/en.lproj/SCViewController.xib
    	samples/SessionLoginSample/SessionLoginSample.xcodeproj/project.pbxproj
    	samples/SessionLoginSample/SessionLoginSample/SLAppDelegate.m
    	samples/SessionLoginSample/SessionLoginSample/SLViewController.m
    	samples/SwitchUserSample/SwitchUserSample.xcodeproj/project.pbxproj
    	samples/SwitchUserSample/SwitchUserSample/SUAppDelegate.m
    	samples/SwitchUserSample/SwitchUserSample/SUProfileTableViewCell.m
    	samples/SwitchUserSample/SwitchUserSample/SUSettingsViewController.m
    	samples/SwitchUserSample/SwitchUserSample/SUUserManager.h
    	samples/SwitchUserSample/SwitchUserSample/SUUserManager.m
    	samples/SwitchUserSample/SwitchUserSample/SUUsingViewController.m
    	src/Core/FBDataDiskCache.m
    	src/Cryptography/FBCrypto.m
    	src/Network/FBGraphObjectTableDataSource.h
    	src/Network/FBGraphObjectTableDataSource.m
    	src/UI/FBFriendPickerViewController.m
    Jérôme Lebel committed Mar 24, 2014
Commits on Mar 11, 2014
  1. fix for XCode 5.1

    Jérôme Lebel committed Mar 11, 2014
Commits on Mar 6, 2014
  1. @chrisp-fb
Commits on Jan 30, 2014
  1. @toddkrabach
Commits on Jan 17, 2014
  1. @toddkrabach

    Facebook iOS SDK 3.11.1

    Summary:
        see https://developers.facebook.com/ios/change-log-3.x/
    
    Upgrading:
        https://developers.facebook.com/docs/ios/upgrading/
    
    Reviewed By: jacl
    
    Test Plan: Release Testing.
    toddkrabach committed Jan 17, 2014
Commits on Jan 8, 2014
  1. less patch

    Jérôme Lebel committed Jan 8, 2014
  2. not sure why id has been replaced by userID And placeID, but it doesn…

    …'t seem useful anymore
    Jérôme Lebel committed Jan 8, 2014
  3. better

    Jérôme Lebel committed Jan 8, 2014
  4. merge

    Jérôme Lebel committed Jan 8, 2014
  5. merge the latest facebook

    Jérôme Lebel committed Jan 8, 2014
Commits on Dec 20, 2013
  1. @chrisp-fb

    Facebook iOS SDK 3.11

    Summary:
         see https://developers.facebook.com/ios/change-log-3.x/
    
    Upgrading:
         https://developers.facebook.com/docs/ios/upgrading/
    
    Reviewed By: jacl
    
    Test Plan: Release Testing.
    chrisp-fb committed Dec 20, 2013
Commits on Nov 20, 2013
  1. @chrisp-fb

    Facebook iOS SDK 3.10

    chrisp-fb committed Nov 19, 2013
Commits on Oct 17, 2013
  1. @chrisp-fb

    Facebook iOS SDK 3.9

    Summary:
         see https://developers.facebook.com/ios/change-log-3.x/
    
    Upgrading from 3.8
         https://developers.facebook.com/docs/ios/upgrading-from-3.8-to-3.9/
    
    Reviewed By: jacl
    
    Test Plan: Release Testing.
    
    @update-submodule: vendor/OCMock
    chrisp-fb committed Oct 17, 2013
Commits on Oct 15, 2013
  1. Merge branch 'facebook_merge'

    Jérôme Lebel committed Oct 15, 2013
  2. Merge branch 'facebook-sdk-master' into facebook_merge

    Jérôme Lebel committed Oct 15, 2013
Commits on Oct 8, 2013
  1. @clang13 @chrisp-fb

    Update project file deployment target to iOS 7 for 64-bit builds.

    Reviewed By: chrisp
    
    Test Plan: Built via XCode 5.
    clang13 committed with chrisp-fb Sep 30, 2013
Commits on Oct 7, 2013
  1. Replaced 'id' property in FBGraphUser.h and FBGraphPlace.h with 'user…

    …ID' and 'placeID' respectively. This solves false positive warnings about usage of private APIs during App Store submission, which may lead to rejection
    
    Conflicts:
    	samples/HelloFacebookSample/HelloFacebookSample/HFViewController.m
    	samples/SwitchUserSample/SwitchUserSample/SUUserManager.m
    	samples/SwitchUserSample/SwitchUserSample/SUUsingViewController.m
    Gabriele Petronella committed with Jérôme Lebel Sep 25, 2013
  2. Merge branch 'facebook-sdk-master' into facebook_merge

    Conflicts:
    	samples/FriendPickerSample/FriendPickerSample.xcodeproj/project.pbxproj
    	samples/FriendPickerSample/FriendPickerSample/FPAppDelegate.m
    	samples/GraphApiSample/GraphApiSample.xcodeproj/project.pbxproj
    	samples/HelloFacebookSample/HelloFacebookSample.xcodeproj/project.pbxproj
    	samples/HelloFacebookSample/HelloFacebookSample/HFViewController.m
    	samples/HelloFacebookSample/HelloFacebookSample/en.lproj/HFViewController_iPad.xib
    	samples/HelloFacebookSample/HelloFacebookSample/en.lproj/HFViewController_iPhone.xib
    	samples/PlacePickerSample/PlacePickerSample.xcodeproj/project.pbxproj
    	samples/PlacePickerSample/PlacePickerSample/PPAppDelegate.m
    	samples/PlacePickerSample/PlacePickerSample/en.lproj/PPViewController_iPad.xib
    	samples/PlacePickerSample/PlacePickerSample/en.lproj/PPViewController_iPhone.xib
    	samples/ProfilePictureSample/ProfilePictureSample.xcodeproj/project.pbxproj
    	samples/ProfilePictureSample/ProfilePictureSample/PPAppDelegate.m
    	samples/ProfilePictureSample/ProfilePictureSample/ProfilePictureSample-Info.plist
    	samples/ProfilePictureSample/ProfilePictureSample/en.lproj/PPViewController_iPad.xib
    	samples/ProfilePictureSample/ProfilePictureSample/en.lproj/PPViewController_iPhone.xib
    	samples/RPSSample/RPSSample.xcodeproj/project.pbxproj
    	samples/RPSSample/RPSSample/en.lproj/RPSGameViewController_iPad.xib
    	samples/RPSSample/RPSSample/en.lproj/RPSGameViewController_iPhone.xib
    	samples/Scrumptious/Scrumptious.xcodeproj/project.pbxproj
    	samples/Scrumptious/scrumptious/SCAppDelegate.m
    	samples/Scrumptious/scrumptious/SCViewController.m
    	samples/SessionLoginSample/SessionLoginSample.xcodeproj/project.pbxproj
    	samples/SwitchUserSample/SwitchUserSample.xcodeproj/project.pbxproj
    	samples/SwitchUserSample/SwitchUserSample/SUAppDelegate.m
    	samples/SwitchUserSample/SwitchUserSample/SUSettingsViewController_iPad.xib
    	samples/SwitchUserSample/SwitchUserSample/SUSettingsViewController_iPhone.xib
    	src/FBViewController.m
    Jérôme Lebel committed Oct 7, 2013
Commits on Sep 19, 2013
  1. @onebit

    Facebook iOS SDK 3.8

    Summary:
         see https://developers.facebook.com/ios/change-log-3.x/
    
        Upgrading from 3.7
         https://developers.facebook.com/docs/ios/upgrading-from-3.7-to-3.8/
    
    Reviewed By: chrisp
    
    Test Plan: Release Testing.
    onebit committed Sep 18, 2013
Commits on Aug 26, 2013
  1. Merge branch 'facebook-sdk-master' into facebook_merge

    Jérôme Lebel committed Aug 26, 2013
  2. Merge branch 'master' of github.com:fotonauts/facebook-ios-sdk into f…

    …acebook_merge
    Jérôme Lebel committed Aug 26, 2013
Commits on Aug 22, 2013
  1. @chrisp-fb

    Facebook iOS SDK 3.7.1

    Summary:
        Bug fixes. See https://developers.facebook.com/ios/change-log-3.x/
    
    Reviewed By: jacl
    
    Test Plan: Release Testing.
    chrisp-fb committed Aug 22, 2013
Commits on Aug 14, 2013
  1. when cancelling an invitation, we don't receive a cancel, but we don'…

    …t receive a post_id neither
    
    Conflicts:
    	src/FBDialog.m
    Jérôme Lebel committed Aug 14, 2013
Something went wrong with that request. Please try again.