Skip to content

Git catastrophe fixed #30

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.

Sign up for GitHub

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

Open
Ericfsod wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Git catastrophe fixed #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1245dd0
Git catastrophe fixed
Ericfsod Sep 29, 2015
936dab7
...
Ericfsod Sep 29, 2015
6e92a97
instance/class method practice, afnetworking practice, commmented out…
Ericfsod Sep 29, 2015
ef2b2ff
setup datasource
Ericfsod Oct 1, 2015
6f957b7
trying google maps api
Ericfsod Oct 1, 2015
b4680c7
safety commit
Ericfsod Oct 1, 2015
cb7f30d
Google Maps API implemented but not working
Ericfsod Oct 1, 2015
0bb3a17
added GMSMapView to project
Ericfsod Oct 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pod 'AFNetworking'

source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.1'
pod 'GoogleMaps'
5 changes: 5 additions & 0 deletions TalkinToTheNet/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pod 'AFNetworking'

source 'https://github.com/CocoaPods/Specs.git'

pod 'GoogleMaps'
33 changes: 33 additions & 0 deletions TalkinToTheNet/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
PODS:
- AFNetworking (2.6.0):
- AFNetworking/NSURLConnection (= 2.6.0)
- AFNetworking/NSURLSession (= 2.6.0)
- AFNetworking/Reachability (= 2.6.0)
- AFNetworking/Security (= 2.6.0)
- AFNetworking/Serialization (= 2.6.0)
- AFNetworking/UIKit (= 2.6.0)
- AFNetworking/NSURLConnection (2.6.0):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/NSURLSession (2.6.0):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/Reachability (2.6.0)
- AFNetworking/Security (2.6.0)
- AFNetworking/Serialization (2.6.0)
- AFNetworking/UIKit (2.6.0):
- AFNetworking/NSURLConnection
- AFNetworking/NSURLSession
- GoogleMaps (1.10.3)

DEPENDENCIES:
- AFNetworking
- GoogleMaps

SPEC CHECKSUMS:
AFNetworking: 79f7eb1a0fcfa7beb409332b2ca49afe9ce53b05
GoogleMaps: 945e4ac3b74bcca3ddada51df256eb7beddb474d

COCOAPODS: 0.38.2
70 changes: 70 additions & 0 deletions TalkinToTheNet/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

206 changes: 206 additions & 0 deletions TalkinToTheNet/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.m
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading