Skip to content
This repository has been archived by the owner on Jan 16, 2021. It is now read-only.

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
natanrolnik committed Nov 22, 2015
2 parents 30492d3 + 1b341b0 commit 3214c9e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
10 changes: 5 additions & 5 deletions ParseUI.podspec
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Pod::Spec.new do |s|
s.name = 'ParseUI'
s.version = '1.1.6'
s.version = '1.1.7'
s.license = { :type => 'SDK', :file => 'LICENSE'}
s.homepage = 'https://www.parse.com/'
s.summary = 'ParseUI is a library of useful User Interface components for the Parse iOS SDK.'
s.authors = 'Parse'
s.social_media_url = 'https://twitter.com/ParseIt'

s.source = { :git => "https://github.com/ParsePlatform/ParseUI-iOS.git", :tag => s.version.to_s }

s.platform = :ios
s.requires_arc = true
s.ios.deployment_target = '7.0'

s.prepare_command = <<-CMD
ruby ParseUI/Scripts/convert_images.rb \
ParseUI/Resources/Images/ \
Expand All @@ -33,6 +33,6 @@ Pod::Spec.new do |s|
'CoreGraphics',
'QuartzCore'

s.dependency 'Bolts/Tasks', '~> 1.2'
s.dependency 'Parse', '~> 1.8'
s.dependency 'Bolts/Tasks', '~> 1.3'
s.dependency 'Parse', '~> 1.9'
end
2 changes: 2 additions & 0 deletions ParseUI/Classes/LogInViewController/PFLogInViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ - (void)_commonInit {
self.modalPresentationStyle = UIModalPresentationFormSheet;
_fields = PFLogInFieldsDefault;

_facebookPermissions = @[ @"public_profile" ];

if ([self respondsToSelector:@selector(automaticallyAdjustsScrollViewInsets)]) {
self.automaticallyAdjustsScrollViewInsets = NO;
}
Expand Down
6 changes: 3 additions & 3 deletions ParseUI/Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>Parse</string>
<string>ParseUI</string>
<key>CFBundleIdentifier</key>
<string>com.parse.parseui</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.1.6</string>
<string>1.1.7</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
Expand All @@ -22,7 +22,7 @@
<string>iPhoneOS</string>
</array>
<key>CFBundleVersion</key>
<string>1.1.6</string>
<string>1.1.7</string>
<key>MinimumOSVersion</key>
<string>6.0</string>
</dict>
Expand Down
Binary file not shown.

0 comments on commit 3214c9e

Please sign in to comment.